Merge pull request 'Fix crash when trying to send data to a disconnected socket. Readme updates.' (#41) from more_fixups into master

Reviewed-on: #41
Reviewed-by: daniel_j <daniel@danieljon.es>

CMakeLists.txt

@@ -28,12 +28,15 @@ include_directories(${CMAKE_BINARY_DIR})
 #
 # Additional paths
 #
-option(IIRC_DEP_EXTRAS OFF)
+set(IIRC_DEP_INCLUDE "" CACHE PATH "Additional include path (single path only)")
-option(IIRC_DEP_INCLUDE "")
+set(IIRC_DEP_LIBRARY "" CACHE PATH "Additional library path (single path only)")
-option(IIRC_DEP_LIBRARY "")
+if (NOT IIRC_DEP_INCLUDE STREQUAL "")
-if (${IIRC_DEP_EXTRAS})
 	include_directories(${IIRC_DEP_INCLUDE})
+	message("Using additional include path: ${IIRC_DEP_INCLUDE}")
+endif()
+if (NOT IIRC_DEP_LIBRARY STREQUAL "")
 	link_directories(${IIRC_DEP_LIBRARY})
+	message("Using additional library path: ${IIRC_DEP_LIBRARY}")
 endif()
 
 # For GCC and Clang, basically.

IRCClient/IRCBase.cpp

@@ -601,6 +601,9 @@ void IRCBase::exceptSSL_Expired(bool except)
 
 void IRCBase::command(const std::string& command, const std::vector<std::string>& args, const std::string& msg)
 {
+    if (!mp->isConnected)
+        return;
+
 	if (msg.empty())
 		mp->writeNoMsg(command, args);
 	else
@@ -609,16 +612,25 @@ void IRCBase::command(const std::string& command, const std::vector<std::string>
 
 void IRCBase::command(const std::string& command, const std::string& msg)
 {
+    if (!mp->isConnected)
+        return;
+
 	mp->write(command, msg);
 }
 
 void IRCBase::raw(const std::string& data)
 {
+    if (!mp->isConnected)
+        return;
+
 	mp->writeNoMsg(data, {});
 }
 
 void IRCBase::ctcp(const std::string& target, const std::string& command, const std::string& message)
 {
+    if (!mp->isConnected)
+        return;
+
 	std::string ctcpdata;
 	ctcpdata.push_back(CTCPflag);
 	ctcpdata.append(command);

README

@@ -5,6 +5,9 @@ http://www.idealirc.org/
 Licensed under the GNU General Public License version 2.
 See LICENSE for more licensing information.
 
+Source code located at
+ https://git.idealirc.org/idealirc/idealirc
+
 The goal for IdealIRC is to provide a modern compliance of the IRC protocol. It aims to be a simple IRC client
 with only the bare minimum for comfort implemented. The intent is to extend the client using scripts.
 
@@ -15,11 +18,12 @@ There is also IRCv3 support which fixes some of the issues with the protocol, su
  - Multiple prefixes - Mitigates a bug in the IRC protocol where users with with multiple privileges only listed
    the most significant privilege.
  - Userhosts in /NAMES
-For more info about IRCv3, visit https://ircv3.net/irc/
 
+For more info about IRCv3, visit
+ https://ircv3.net/irc/
 
 For general help with the client, visit
  http://www.idealirc.org/wiki
 
 For building instructions and source code documentation, visit
- https://git.idealirc.org:3000/idealirc/idealirc/wiki/Home
+ https://git.idealirc.org/idealirc/idealirc/wiki/Home