make settings dialog bigger to fix content

CMakeLists.txt

@@ -72,7 +72,7 @@ add_executable(ezremote_client
 
 add_self(ezremote_client)
 
-add_pkg(ezremote_client ${CMAKE_SOURCE_DIR}/data "RMTC00001" "ezRemote Client" "01.18" 32 0)
+add_pkg(ezremote_client ${CMAKE_SOURCE_DIR}/data "RMTC00001" "ezRemote Client" "01.19" 32 0)
 
 target_link_libraries(ezremote_client
   c

source/installer.cpp

@@ -241,6 +241,46 @@ namespace INSTALLER
 		return "";
 	}
 
+	void *CheckBgInstallTaskThread(void *argp)
+	{
+		bool completed = false;
+		OrbisBgftTaskProgress progress_info;
+		BgProgressCheck *bg_check_data = (BgProgressCheck*) argp;
+		int ret;
+
+		while (!completed)
+		{
+			memset(&progress_info, 0, sizeof(progress_info));
+			ret = sceBgftServiceDownloadGetProgress(bg_check_data->task_id, &progress_info);
+			if (ret || (progress_info.transferred > 0 && progress_info.errorResult != 0))
+			{
+				goto finish;
+			}
+			if (progress_info.length > 0)
+			{
+				completed = progress_info.transferred == progress_info.length;
+				bytes_to_download = progress_info.length;
+				bytes_transfered = progress_info.transferred;
+			}
+			sceSystemServicePowerTick();
+			sceKernelUsleep(500000);
+		}
+	finish:
+		if (bg_check_data->pkg_data != nullptr)
+		{
+			bg_check_data->pkg_data->stop_write_thread = true;
+			pthread_join(bg_check_data->pkg_data->thread, NULL);
+			delete(bg_check_data->pkg_data->split_file);
+			free(bg_check_data->pkg_data);
+			RemoveArchivePkgInstallData(bg_check_data->hash);
+			free(bg_check_data);
+		}
+		activity_inprogess = false;
+		file_transfering = false;
+		Windows::SetModalMode(false);
+		return nullptr;
+	}
+
 	bool canInstallRemotePkg(const std::string &url)
 	{
 		return true;
@@ -380,6 +420,16 @@ namespace INSTALLER
 				sceSystemServicePowerTick();
 			}
 		}
+		else
+		{
+			BgProgressCheck *bg_check_data = (BgProgressCheck*) malloc(sizeof(BgProgressCheck));
+			memset(bg_check_data, 0, sizeof(BgProgressCheck));
+			bg_check_data->pkg_data = nullptr;
+			bg_check_data->task_id = task_id;
+			bg_check_data->hash = "";
+			ret = pthread_create(&bk_install_thid, NULL, CheckBgInstallTaskThread, bg_check_data);
+			return 1;
+		}
 
 		return 1;
 	err:
@@ -751,40 +801,6 @@ namespace INSTALLER
 		archive_pkg_install_data_list.erase(hash);
 	}
 
-	void *CheckBgInstallTaskThread(void *argp)
-	{
-		bool completed = false;
-		OrbisBgftTaskProgress progress_info;
-		BgProgressCheck *bg_check_data = (BgProgressCheck*) argp;
-		int ret;
-
-		while (!completed)
-		{
-			memset(&progress_info, 0, sizeof(progress_info));
-			ret = sceBgftServiceDownloadGetProgress(bg_check_data->task_id, &progress_info);
-			if (ret || (progress_info.transferred > 0 && progress_info.errorResult != 0))
-			{
-				goto finish;
-			}
-			if (progress_info.length > 0)
-			{
-				completed = progress_info.transferred == progress_info.length;
-				bytes_to_download = progress_info.length;
-				bytes_transfered = progress_info.transferred;
-			}
-			sceSystemServicePowerTick();
-			sceKernelUsleep(500000);
-		}
-	finish:
-		bg_check_data->pkg_data->stop_write_thread = true;
-		pthread_join(bg_check_data->pkg_data->thread, NULL);
-		delete(bg_check_data->pkg_data->split_file);
-		free(bg_check_data->pkg_data);
-		RemoveArchivePkgInstallData(bg_check_data->hash);
-		free(bg_check_data);
-		return nullptr;
-	}
-
 	bool InstallArchivePkg(const std::string &path, ArchivePkgInstallData* pkg_data, bool bg)
 	{
 		pkg_header header;

source/server/http_server.cpp

@@ -1159,6 +1159,9 @@ namespace HttpServer
             if (download_url.empty())
             {
                 failed(res, 200, lang_strings[STR_CANT_EXTRACT_URL_MSG]);
+                activity_inprogess = false;
+                file_transfering = false;
+                Windows::SetModalMode(true);
                 return;
             }
 
@@ -1181,10 +1184,13 @@ namespace HttpServer
                 delete(baseclient);
 
                 std::string remote_install_url = std::string("http://localhost:") + std::to_string(http_server_port) + "/rmt_inst/Site%2099/" + hash;
-                int rc = INSTALLER::InstallRemotePkg(remote_install_url, &header, title, true);
+                int rc = INSTALLER::InstallRemotePkg(remote_install_url, &header, title, false);
                 if (rc == 0)
                 {
                     failed(res, 200, lang_strings[STR_FAIL_INSTALL_FROM_URL_MSG]);
+                    activity_inprogess = false;
+                    file_transfering = false;
+                    Windows::SetModalMode(true);
                     return;
                 }
             }
@@ -1205,7 +1211,7 @@ namespace HttpServer
 
                     int ret = pthread_create(&install_data->thread, NULL, Actions::ExtractArchivePkg, install_data);
 
-                    ret = INSTALLER::InstallArchivePkg(entry->filename, install_data);
+                    ret = INSTALLER::InstallArchivePkg(entry->filename, install_data, true);
 
                     if (ret == 0)
                     {
@@ -1225,9 +1231,6 @@ namespace HttpServer
                     return;
                 }
             }
-            activity_inprogess = false;
-            file_transfering = false;
-            Windows::SetModalMode(false);
             success(res);
         });
 

source/windows.cpp

@@ -1621,7 +1621,7 @@ namespace Windows
             ImGui::OpenPopup(lang_strings[STR_SETTINGS]);
 
             ImGui::SetNextWindowPos(ImVec2(1050, 80));
-            ImGui::SetNextWindowSizeConstraints(ImVec2(850, 80), ImVec2(850, 650), NULL, NULL);
+            ImGui::SetNextWindowSizeConstraints(ImVec2(850, 80), ImVec2(850, 750), NULL, NULL);
             if (ImGui::BeginPopupModal(lang_strings[STR_SETTINGS], NULL, ImGuiWindowFlags_AlwaysAutoResize))
             {
                 char id[192];