diff options
Diffstat (limited to 'plugins/PluginUpdater/src/Events.cpp')
| -rw-r--r-- | plugins/PluginUpdater/src/Events.cpp | 43 |
1 files changed, 18 insertions, 25 deletions
diff --git a/plugins/PluginUpdater/src/Events.cpp b/plugins/PluginUpdater/src/Events.cpp index 90ad62e3fb..6afabbe2a7 100644 --- a/plugins/PluginUpdater/src/Events.cpp +++ b/plugins/PluginUpdater/src/Events.cpp @@ -30,23 +30,34 @@ int OnFoldersChanged(WPARAM, LPARAM) return 0;
}
-int ModulesLoaded(WPARAM, LPARAM)
+void EmptyFolder()
{
- HookEvent(ME_FOLDERS_PATH_CHANGED, OnFoldersChanged);
+ SHFILEOPSTRUCT file_op = {
+ NULL,
+ FO_DELETE,
+ tszRoot,
+ _T(""),
+ FOF_NOERRORUI | FOF_SILENT | FOF_NOCONFIRMATION,
+ false,
+ 0,
+ _T("") };
+ SHFileOperation(&file_op);
+}
- hPluginUpdaterFolder = FoldersRegisterCustomPathT(MODULEA, LPGEN("Plugin Updater"), MIRANDA_PATHT _T("\\")DEFAULT_UPDATES_FOLDER);
- if (hPluginUpdaterFolder)
+int ModulesLoaded(WPARAM, LPARAM)
+{
+ if (hPluginUpdaterFolder = FoldersRegisterCustomPathT(MODULEA, LPGEN("Plugin Updater"), MIRANDA_PATHT _T("\\")DEFAULT_UPDATES_FOLDER)) {
+ HookEvent(ME_FOLDERS_PATH_CHANGED, OnFoldersChanged);
OnFoldersChanged(0, 0);
+ }
else
lstrcpyn(tszRoot, VARST( _T("%miranda_path%\\"DEFAULT_UPDATES_FOLDER)), SIZEOF(tszRoot));
- opts.bSilent = true;
-
int iRestartCount = db_get_b(NULL, MODNAME, "RestartCount", 2);
if (iRestartCount > 0)
db_set_b(NULL, MODNAME, "RestartCount", iRestartCount-1);
else
- EmptyFolder(0, TRUE); // silently
+ EmptyFolder(); // silently
CheckUpdateOnStartup();
@@ -56,24 +67,6 @@ int ModulesLoaded(WPARAM, LPARAM) return 0;
}
-INT_PTR EmptyFolder(WPARAM,LPARAM lParam)
-{
- SHFILEOPSTRUCT file_op = {
- NULL,
- FO_DELETE,
- tszRoot,
- _T(""),
- FOF_NOERRORUI |
- FOF_SILENT,
- false,
- 0,
- _T("") };
- if (lParam)
- file_op.fFlags |= FOF_NOCONFIRMATION;
- SHFileOperation(&file_op);
- return 0;
-}
-
int OnPreShutdown(WPARAM, LPARAM)
{
CancelWaitableTimer(Timer);
|