summaryrefslogtreecommitdiff
path: root/plugins/TopToolBar
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/TopToolBar')
-rw-r--r--plugins/TopToolBar/toolbar.cpp11
-rw-r--r--plugins/TopToolBar/topbutton.cpp2
2 files changed, 5 insertions, 8 deletions
diff --git a/plugins/TopToolBar/toolbar.cpp b/plugins/TopToolBar/toolbar.cpp
index d36dca62bf..8e42322e58 100644
--- a/plugins/TopToolBar/toolbar.cpp
+++ b/plugins/TopToolBar/toolbar.cpp
@@ -504,7 +504,7 @@ INT_PTR TTBSetOptions(WPARAM wParam, LPARAM lParam)
b->SetBitmap();
if (retval & TTBBF_VISIBLE) {
ArrangeButtons();
- // save button setting
+ b->SaveSettings(0,0);
}
retval = 1;
@@ -541,17 +541,17 @@ INT_PTR TTBSetOptions(WPARAM wParam, LPARAM lParam)
if (changed)
b->SetBitmap();
- changed = 0;
if (retval & TTBBF_VISIBLE) {
ArrangeButtons();
- changed = 1;
+ b->SaveSettings(0,0);
}
if (b->dwFlags & TTBBF_ISLBUTTON) {
if (b->program != NULL)
free(b->program);
b->program = _tcsdup(lpTTB->program);
- changed = 1; // for launch buttons from user, not options (options don't share handles)
+// don't save program changing in use buttons
+// changed = 1; // for launch buttons from user, not options (options don't share handles)
}
else {
if (b->pszService != NULL)
@@ -559,9 +559,6 @@ INT_PTR TTBSetOptions(WPARAM wParam, LPARAM lParam)
b->pszService = _strdup(lpTTB->pszService);
}
-// if (changed)
-// ;// save button setting
-
b->lParamUp = lpTTB->lParamUp;
b->wParamUp = lpTTB->wParamUp;
b->lParamDown = lpTTB->lParamDown;
diff --git a/plugins/TopToolBar/topbutton.cpp b/plugins/TopToolBar/topbutton.cpp
index 81ba8d5433..205af2a4e7 100644
--- a/plugins/TopToolBar/topbutton.cpp
+++ b/plugins/TopToolBar/topbutton.cpp
@@ -85,7 +85,7 @@ void TopButtonInt::LoadSettings()
if ( DBGetContactSettingByte(0, TTB_OPTDIR, AS(buf, buf2, "_Visible"), oldv) > 0 )
dwFlags |= TTBBF_VISIBLE;
}
- else if (dwFlags & TTBBF_ISLBUTTON) {
+ else if ((dwFlags & TTBBF_ISLBUTTON ) && (dwFlags & TTBBF_INTERNAL)) {
char buf1[10];
_itoa(wParamDown, buf1, 10);
char buf2[20];