Update and mergefix

JibbSmart · Feb 23, 2021 · e5cf2a8 · e5cf2a8
1 parent b63c1dc
commit e5cf2a8
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 34 deletions.
diff --git a/JoyShockMapper/CMakeLists.txt b/JoyShockMapper/CMakeLists.txt
@@ -125,7 +125,7 @@ CPMAddPackage (
     GITHUB_REPOSITORY libsdl-org/SDL
     VERSION 2.0.15
     # 2.0.15 hasn't released yet, so let's use a specific commit
-    GIT_TAG 42607909a0b19b36c26be804c75b6050dba97af3
+    GIT_TAG c287087fcce57af086c0a52f74fcdb74e9084c55
 )
 
 target_link_libraries (

diff --git a/JoyShockMapper/src/main.cpp b/JoyShockMapper/src/main.cpp
@@ -3219,6 +3219,20 @@ class HelpCmd : public JSMMacro
 				COUT << arg << " is not a recognized command" << endl;
 			}
 		}
+		else
+		{
+			// Show all commands that include ARG
+			cout << "\"" << arg << "\" is not a command, but the following are:" << endl;
+			vector<string> list;
+			registry->GetCommandList(list);
+			for (auto cmd : list)
+			{
+				auto pos = cmd.find(arg);
+				if(pos != string::npos)
+					cout << "    " << cmd << endl;
+			}
+			cout << "Enter HELP [cmd1] [cmd2] ... for details on specific commands." << endl;
+		}
 		return true;
 	}
 public: