Fix error in installs dialog

Ravbug · Ravbug · commit 79f31d661f6f · 2024-09-15T12:43:35.000-04:00
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");

Original file line number	Diff line number	Diff line change
`@@ -52,14 +52,19 @@ void AddNewInstallDlg::PopulateTable(wxCommandEvent&){`
`52`	`52`	`installSearchSizer->Layout();`
`53`	`53`	`}`
`54`	`54`
	`55`	`+#define TRYCATCH 1`
	`56`	`+`
`55`	`57`
`56`	`58`	`void AddNewInstallDlg::GetAllVersions(){`
`57`	`59`	`#ifndef __linux__`
`58`	`60`
`59`	`61`	`// version date info`
`60`	`62`	`unordered_map<string,string> versionDates;`
`61`	`63`	`{`
`62`		`- try{`
	`64`	`+#if TRYCATCH`
	`65`	`+ try`
	`66`	`+#endif`
	`67`	`+ {`
`63`	`68`	`auto r = fetch("https://symbolserver.unity3d.com/000Admin/history.txt");`
`64`	`69`	`if (r.code != 200){`
`65`	`70`	`wxMessageBox("Unable to access Unity version metadata", "Download error", wxOK \| wxICON_ERROR);`
`@@ -107,6 +112,9 @@ void AddNewInstallDlg::GetAllVersions(){`
`107`	`112`
`108`	`113`	`// get the version and hashcode`
`109`	`114`	`auto slashpos = versiondata.find_first_of("/");`
	`115`	`+ if (slashpos == versiondata.npos){`
	`116`	`+ continue;`
	`117`	`+ }`
`110`	`118`
`111`	`119`	`auto version = string(string_view(versiondata.data(),slashpos));`
`112`	`120`	`if (versionDates.find(version) != versionDates.end()){`
`@@ -122,9 +130,11 @@ void AddNewInstallDlg::GetAllVersions(){`
`122`	`130`	`}`
`123`	`131`	`}`
`124`	`132`	`}`
	`133`	`+#if TRYCATCH`
`125`	`134`	`catch(std::exception& e){`
`126`	`135`	`wxMessageBox(fmt::format("Network error: {}", e.what()), "Error", wxOK \| wxICON_ERROR);`
`127`	`136`	`}`
	`137`	`+#endif`
`128`	`138`	`}`
`129`	`139`	`#endif`
`130`	`140`	`}`
Original file line number	Diff line number	Diff line change
`@@ -228,7 +228,7 @@ void MainFrameDerived::OnAbout(wxCommandEvent& event)`
`228`	`228`	`{`
`229`	`229`	`wxAboutDialogInfo aboutInfo;`
`230`	`230`	`aboutInfo.SetName("Unity Hub Native");`
`231`		`- aboutInfo.SetCopyright(fmt::format("(C) Ravbug {}",BUILD_YEAR));`
	`231`	`+ aboutInfo.SetCopyright(fmt::format("(C) Ravbug 2019-{}",BUILD_YEAR));`
`232`	`232`	`aboutInfo.SetDescription("Developed with wxWidgets in C++");`
`233`	`233`	`#if defined __linux__`
`234`	`234`	`aboutInfo.SetWebSite("https://github.com/ravbug/UnityHubNative");`