Fix error in installs dialog

Ravbug · Sep 15, 2024 · 79f31d6 · 79f31d6
1 parent 16a68d8
commit 79f31d6
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 5 deletions.
diff --git a/source/Info.plist b/source/Info.plist
@@ -22,13 +22,13 @@
 		<string>it</string>
 	</array>
 	<key>CFBundleLongVersionString</key>
-	<string>(c) 2024 Ravbug</string>
+	<string>(c) 2019-2024 Ravbug</string>
 	<key>CFBundleName</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.54</string>
+	<string>1.55</string>
 	<key>CFBundleSignature</key>
 	<string>UNHn</string>
 	<key>CFBundleVersion</key>

diff --git a/source/add_install_dlg_derived.cpp b/source/add_install_dlg_derived.cpp
@@ -52,14 +52,19 @@ void AddNewInstallDlg::PopulateTable(wxCommandEvent&){
     installSearchSizer->Layout();
 }
 
+#define TRYCATCH 1
+
 
 void AddNewInstallDlg::GetAllVersions(){
 #ifndef __linux__
 
     // version date info
     unordered_map<string,string> versionDates;
     {
-		try{
+#if TRYCATCH
+		try
+#endif
+        {
 			auto r = fetch("https://symbolserver.unity3d.com/000Admin/history.txt");
 			if (r.code != 200){
 				wxMessageBox("Unable to access Unity version metadata", "Download error", wxOK | wxICON_ERROR);
@@ -107,6 +112,9 @@ void AddNewInstallDlg::GetAllVersions(){
 
 								// get the version and hashcode
 								auto slashpos = versiondata.find_first_of("/");
+                                if (slashpos == versiondata.npos){
+                                    continue;
+                                }
 
 								auto version = string(string_view(versiondata.data(),slashpos));
 								if (versionDates.find(version) != versionDates.end()){
@@ -122,9 +130,11 @@ void AddNewInstallDlg::GetAllVersions(){
 				}
 			}
 		}
+#if TRYCATCH
 		catch(std::exception& e){
 			wxMessageBox(fmt::format("Network error: {}", e.what()), "Error", wxOK | wxICON_ERROR);
 		}
+#endif
     }
 #endif
 }

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.54";
+static constexpr std::string_view AppVersion = "v1.55";
 
 struct wxListCtrl;
 struct wxWindow;

diff --git a/source/interface_derived.cpp b/source/interface_derived.cpp
@@ -228,7 +228,7 @@ void MainFrameDerived::OnAbout(wxCommandEvent& event)
 {
 	wxAboutDialogInfo aboutInfo;
 	aboutInfo.SetName("Unity Hub Native");	
-	aboutInfo.SetCopyright(fmt::format("(C) Ravbug {}",BUILD_YEAR));
+	aboutInfo.SetCopyright(fmt::format("(C) Ravbug 2019-{}",BUILD_YEAR));
 	aboutInfo.SetDescription("Developed with wxWidgets in C++");
 #if defined __linux__
 	aboutInfo.SetWebSite("https://github.com/ravbug/UnityHubNative");