chibicitiberiu/rainmeter-studio
1
0
Fork 0
mirror of https://github.com/chibicitiberiu/rainmeter-studio.git synced 2024-02-24 04:33:31 +00:00
Code Issues Releases Wiki Activity

Fixed minor access violation when closing About dialog.

Browse Source
This commit is contained in:
spx 2011-02-05 07:48:29 +00:00
parent 1115764ce4
commit b79d3e8521
1 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
Library/AboutDialog.cpp
View File

@ -27,6 +27,8 @@
#define LOGTIMER 1 #define LOGTIMER 1
#define WM_DELAYED_CLOSE WM_APP + 0
extern CRainmeter* Rainmeter; extern CRainmeter* Rainmeter;
INT_PTR CALLBACK AboutProc(HWND hwndDlg, UINT message, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK AboutProc(HWND hwndDlg, UINT message, WPARAM wParam, LPARAM lParam);
@ -533,23 +535,14 @@ INT_PTR CALLBACK AboutProc(HWND hwndDlg, UINT message, WPARAM wParam, LPARAM lPa
pos->cx = max(420, pos->cx); pos->cx = max(420, pos->cx);
pos->cy = max(340, pos->cy); pos->cy = max(340, pos->cy);
} }
break; return TRUE;
case WM_SIZE: case WM_SIZE:
RepositionControls(hwndDlg); RepositionControls(hwndDlg);
break; return TRUE;
case WM_CLOSE: case WM_CLOSE:
KillTimer(hwndDlg, LOGTIMER); PostMessage(hwndDlg, WM_DELAYED_CLOSE, 0, 0);
Rainmeter->SaveSettings();
GetWindowPlacement(hwndDlg, &g_DialogPlacement);
if (g_DialogPlacement.showCmd == SW_SHOWMINIMIZED)
{
g_DialogPlacement.showCmd = SW_SHOWNORMAL;
}
DestroyWindow(hwndDlg);
g_DialogWin = NULL;
g_Plugins.clear();
return TRUE; return TRUE;
case WM_COMMAND: case WM_COMMAND:
@ -564,10 +557,10 @@ INT_PTR CALLBACK AboutProc(HWND hwndDlg, UINT message, WPARAM wParam, LPARAM lPa
{ {
Rainmeter->SetDisableVersionCheck(FALSE); Rainmeter->SetDisableVersionCheck(FALSE);
} }
break; return TRUE;
case IDOK: case IDOK:
SendMessage(hwndDlg, WM_CLOSE, 0, 0); PostMessage(hwndDlg, WM_DELAYED_CLOSE, 0, 0);
return TRUE; return TRUE;
case IDC_ABOUT_ENTRIES: case IDC_ABOUT_ENTRIES:
@ -586,11 +579,25 @@ INT_PTR CALLBACK AboutProc(HWND hwndDlg, UINT message, WPARAM wParam, LPARAM lPa
UpdateWidgets(); UpdateWidgets();
UpdateAboutStatistics(); UpdateAboutStatistics();
return TRUE;
} }
break; break;
} }
break; break;
case WM_DELAYED_CLOSE:
KillTimer(hwndDlg, LOGTIMER);
Rainmeter->SaveSettings();
GetWindowPlacement(hwndDlg, &g_DialogPlacement);
if (g_DialogPlacement.showCmd == SW_SHOWMINIMIZED)
{
g_DialogPlacement.showCmd = SW_SHOWNORMAL;
}
DestroyWindow(hwndDlg);
g_DialogWin = NULL;
g_Plugins.clear();
return TRUE;
case WM_TIMER: case WM_TIMER:
if (wParam == LOGTIMER) if (wParam == LOGTIMER)
{ {