Bug fixes in Installs pane

Ravbug · Ravbug · commit 925eb6875cc1 · 2024-12-22T15:48:54.000-08:00
~ fix Reveal in Explorer
~ fix Uninstall
diff --git a/source/Info.plist b/source/Info.plist
@@ -28,7 +28,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.56</string>
+	<string>1.57</string>
 	<key>CFBundleSignature</key>
 	<string>UNHn</string>
 	<key>CFBundleVersion</key>
diff --git a/source/globals.h b/source/globals.h
@@ -14,7 +14,7 @@
 static constexpr std::string_view projectsFile = "projects.txt";
 static constexpr std::string_view editorPathsFile = "editorPaths.txt";
 static constexpr std::string_view templatePrefix = "com.unity.template";
-static constexpr std::string_view AppVersion = "v1.56";
+static constexpr std::string_view AppVersion = "v1.57";
 
 struct wxListCtrl;
 struct wxWindow;
diff --git a/source/interface_derived.cpp b/source/interface_derived.cpp
@@ -666,7 +666,7 @@ void MainFrameDerived::OnUninstall(wxCommandEvent &){
 		reveal_in_explorer(editor.path);
 #elif defined _WIN32
 		// execute the uninstaller
-		auto uninstaller_path = std::filesystem::path(editor.path) / editor.name / "Editor\\Uninstall.exe";
+		auto uninstaller_path = std::filesystem::path(editor.path) / "Editor\\Uninstall.exe";
 		ShellExecute(0, 0, uninstaller_path.c_str(), NULL, 0, SW_SHOW);
 #endif
     }
diff --git a/source/interface_derived.hpp b/source/interface_derived.hpp
@@ -148,7 +148,7 @@ class MainFrameDerived : public MainFrame{
 		int id = installsList->GetSelection();
 		if (id != wxNOT_FOUND){
 			editor& e = editors[id];
-			std::filesystem::path path = e.path / e.name;
+			std::filesystem::path path = e.path;
             if (!std::filesystem::exists(path)){
                 reveal_in_explorer(e.path);
             }

Original file line number	Diff line number	Diff line change
`@@ -666,7 +666,7 @@ void MainFrameDerived::OnUninstall(wxCommandEvent &){`
`666`	`666`	`reveal_in_explorer(editor.path);`
`667`	`667`	`#elif defined _WIN32`
`668`	`668`	`// execute the uninstaller`
`669`		`- auto uninstaller_path = std::filesystem::path(editor.path) / editor.name / "Editor\\Uninstall.exe";`
	`669`	`+ auto uninstaller_path = std::filesystem::path(editor.path) / "Editor\\Uninstall.exe";`
`670`	`670`	`ShellExecute(0, 0, uninstaller_path.c_str(), NULL, 0, SW_SHOW);`
`671`	`671`	`#endif`
`672`	`672`	`}`
Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ class MainFrameDerived : public MainFrame{`
`148`	`148`	`int id = installsList->GetSelection();`
`149`	`149`	`if (id != wxNOT_FOUND){`
`150`	`150`	`editor& e = editors[id];`
`151`		`- std::filesystem::path path = e.path / e.name;`
	`151`	`+ std::filesystem::path path = e.path;`
`152`	`152`	`if (!std::filesystem::exists(path)){`
`153`	`153`	`reveal_in_explorer(e.path);`
`154`	`154`	`}`