diff options
Diffstat (limited to 'plugins/PluginUpdater/src')
| -rw-r--r-- | plugins/PluginUpdater/src/Common.h | 1 | ||||
| -rw-r--r-- | plugins/PluginUpdater/src/DlgListNew.cpp | 10 | ||||
| -rw-r--r-- | plugins/PluginUpdater/src/DlgUpdate.cpp | 10 | ||||
| -rw-r--r-- | plugins/PluginUpdater/src/Services.cpp | 2 |
4 files changed, 14 insertions, 9 deletions
diff --git a/plugins/PluginUpdater/src/Common.h b/plugins/PluginUpdater/src/Common.h index 3785594d4a..2f916f3673 100644 --- a/plugins/PluginUpdater/src/Common.h +++ b/plugins/PluginUpdater/src/Common.h @@ -40,6 +40,7 @@ Boston, MA 02111-1307, USA. #include <m_netlib.h>
#include <m_icolib.h>
#include <win2k.h>
+#include "m_pluginupdater.h"
#include <m_folders.h>
#include <m_popup2.h>
diff --git a/plugins/PluginUpdater/src/DlgListNew.cpp b/plugins/PluginUpdater/src/DlgListNew.cpp index eded09dc1e..255066ea01 100644 --- a/plugins/PluginUpdater/src/DlgListNew.cpp +++ b/plugins/PluginUpdater/src/DlgListNew.cpp @@ -40,7 +40,7 @@ static void ApplyDownloads(void *param) // if we need to escalate priviledges, launch a atub
if (!PrepareEscalation()) {
- DestroyWindow(hDlg);
+ EndDialog(hDlg, 0);
return;
}
@@ -118,9 +118,7 @@ static void ApplyDownloads(void *param) if (rc == IDYES)
CallFunctionAsync(OpenPluginOptions, 0);
- CloseWindow(hDlg);
- DestroyWindow(hDlg);
- hwndDialog = NULL;
+ EndDialog(hDlg, 0);
return;
}
@@ -363,6 +361,10 @@ INT_PTR CALLBACK DlgList(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) }
break;
+ case WM_CLOSE:
+ DestroyWindow(hDlg);
+ break;
+
case WM_DESTROY:
Utils_SaveWindowPosition(hDlg, NULL, MODNAME, "ListWindow");
Skin_ReleaseIcon((HICON)SendMessage(hDlg, WM_SETICON, ICON_BIG, 0));
diff --git a/plugins/PluginUpdater/src/DlgUpdate.cpp b/plugins/PluginUpdater/src/DlgUpdate.cpp index ebef698ea5..7979403af1 100644 --- a/plugins/PluginUpdater/src/DlgUpdate.cpp +++ b/plugins/PluginUpdater/src/DlgUpdate.cpp @@ -48,7 +48,7 @@ static void ApplyUpdates(void *param) // if we need to escalate priviledges, launch a atub
if (!PrepareEscalation()) {
- DestroyWindow(hDlg);
+ EndDialog(hDlg, 0);
return;
}
@@ -147,7 +147,8 @@ static void ApplyUpdates(void *param) if (rc == IDYES)
CallFunctionAsync(RestartMe, 0);
}
- DestroyWindow(hDlg);
+ EndDialog(hDlg, 0);
+ return;
}
static void ResizeVert(HWND hDlg, int yy)
@@ -305,7 +306,6 @@ static INT_PTR CALLBACK DlgUpdate(HWND hDlg, UINT message, WPARAM wParam, LPARAM break;
case IDCANCEL:
- Utils_SaveWindowPosition(hDlg, NULL, MODNAME, "ConfirmWindow");
DestroyWindow(hDlg);
return TRUE;
}
@@ -317,6 +317,10 @@ static INT_PTR CALLBACK DlgUpdate(HWND hDlg, UINT message, WPARAM wParam, LPARAM DestroyWindow(hDlg);
break;
+ case WM_CLOSE:
+ DestroyWindow(hDlg);
+ break;
+
case WM_DESTROY:
Skin_ReleaseIcon((HICON)SendMessage(hDlg, WM_SETICON, ICON_SMALL, 0));
Utils_SaveWindowPosition(hDlg, NULL, MODNAME, "ConfirmWindow");
diff --git a/plugins/PluginUpdater/src/Services.cpp b/plugins/PluginUpdater/src/Services.cpp index 0fb3bf4c1b..282163c88d 100644 --- a/plugins/PluginUpdater/src/Services.cpp +++ b/plugins/PluginUpdater/src/Services.cpp @@ -19,8 +19,6 @@ Boston, MA 02111-1307, USA. #include "common.h"
-#include "m_pluginupdater.h"
-
static INT_PTR srvParseHashes(WPARAM wParam, LPARAM lParam)
{
LPCTSTR ptszUrl = (LPCTSTR)wParam;
|