Merge remote-tracking branch 'dhewm3/master'

Author: FriskTheFallenHuman

neo/CMakeLists.txt

@@ -131,7 +131,11 @@ else()
 	add_definitions(-DIMGUI_DISABLE)
 endif()
 
-# Curl
+if(DEFINED ENV{MSYSTEM})
+	message(STATUS "Detected MSYS or similar environment. Using alternate curl path")
+	set(CURL_NO_CURL_CMAKE ON)
+endif()
+
 find_package(CURL QUIET)
 if(CURL_FOUND)
 	set(ID_ENABLE_CURL ON)

neo/ui/Window.cpp

@@ -1117,8 +1117,13 @@ void idWindow::Time() {
 			}
 		}
 	}
-	if ( gui->Active() ) {
-		gui->GetPendingCmd() += cmd;
+	if ( gui->Active() && cmd.Length() > 0 ) {
+		// DG: can't just append the command, must separate commands with " ; "
+		idStr& pend = gui->GetPendingCmd();
+		if ( pend.Length() > 0 ) {
+			pend += " ; ";
+		}
+		pend += cmd;
 	}
 }