From 231d58ed5b9025783b3e63bd81b25241441bc237 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20P=C3=B6sel?= Date: Thu, 29 May 2014 16:40:23 +0000 Subject: Plugin Updater: When checking updates from main menu, show dialog even if silentMode is enabled; Version bump git-svn-id: http://svn.miranda-ng.org/main/trunk@9356 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/PluginUpdater/src/DlgUpdate.cpp | 6 +++++- plugins/PluginUpdater/src/Version.h | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'plugins/PluginUpdater') diff --git a/plugins/PluginUpdater/src/DlgUpdate.cpp b/plugins/PluginUpdater/src/DlgUpdate.cpp index bf0b803862..7e5c241d69 100644 --- a/plugins/PluginUpdater/src/DlgUpdate.cpp +++ b/plugins/PluginUpdater/src/DlgUpdate.cpp @@ -326,6 +326,7 @@ static INT_PTR CALLBACK DlgUpdate(HWND hDlg, UINT message, WPARAM wParam, LPARAM Skin_ReleaseIcon((HICON)SendMessage(hDlg, WM_SETICON, ICON_SMALL, 0)); Utils_SaveWindowPosition(hDlg, NULL, MODNAME, "ConfirmWindow"); hwndDialog = NULL; + opts.bSilent = true; delete (OBJLIST *)GetWindowLongPtr(hDlg, GWLP_USERDATA); SetWindowLongPtr(hDlg, GWLP_USERDATA, 0); break; @@ -471,7 +472,7 @@ static void DlgUpdateSilent(void *lParam) static void __stdcall LaunchDialog(void *param) { - if (opts.bSilentMode) + if (opts.bSilentMode && opts.bSilent) mir_forkthread(DlgUpdateSilent, param); else CreateDialogParam(hInst, MAKEINTRESOURCE(IDD_UPDATE), GetDesktopWindow(), DlgUpdate, (LPARAM)param); @@ -694,8 +695,11 @@ static void CheckUpdates(void *) if (!opts.bSilent) ShowPopup(0, LPGENT("Plugin Updater"), LPGENT("No updates found."), 2, 0); delete UpdateFiles; + opts.bSilent = true; } else CallFunctionAsync(LaunchDialog, UpdateFiles); + } else { + opts.bSilent = true; } InitTimer(success ? 0 : 2); diff --git a/plugins/PluginUpdater/src/Version.h b/plugins/PluginUpdater/src/Version.h index 9e347c0ead..bdadc348c3 100644 --- a/plugins/PluginUpdater/src/Version.h +++ b/plugins/PluginUpdater/src/Version.h @@ -1,7 +1,7 @@ #define __MAJOR_VERSION 0 #define __MINOR_VERSION 1 -#define __RELEASE_NUM 1 -#define __BUILD_NUM 9 +#define __RELEASE_NUM 2 +#define __BUILD_NUM 0 #include -- cgit v1.2.3