summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--plugins/TopToolBar/topbutton.cpp4
-rw-r--r--plugins/TopToolBar/ttbopt.cpp1
2 files changed, 2 insertions, 3 deletions
diff --git a/plugins/TopToolBar/topbutton.cpp b/plugins/TopToolBar/topbutton.cpp
index c0bb99ae55..81ba8d5433 100644
--- a/plugins/TopToolBar/topbutton.cpp
+++ b/plugins/TopToolBar/topbutton.cpp
@@ -111,7 +111,7 @@ void TopButtonInt::SaveSettings(int &SepCnt, int &LaunchCnt)
{
char buf[255];
- if (dwFlags & (TTBBF_ISSEPARATOR | TTBBF_INTERNAL)) {
+ if ((dwFlags & TTBBF_ISSEPARATOR) && (dwFlags & TTBBF_INTERNAL)) {
char buf1[10];
_itoa(++SepCnt, buf1, 10);
char buf2[20];
@@ -120,7 +120,7 @@ void TopButtonInt::SaveSettings(int &SepCnt, int &LaunchCnt)
DBWriteContactSettingByte(0, TTB_OPTDIR, AS(buf, buf2, "_Position"), arrangedpos);
DBWriteContactSettingByte(0, TTB_OPTDIR, AS(buf, buf2, "_Visible"), dwFlags & TTBBF_VISIBLE);
}
- else if (dwFlags & (TTBBF_ISLBUTTON | TTBBF_INTERNAL)) {
+ else if ((dwFlags & TTBBF_ISLBUTTON ) && (dwFlags & TTBBF_INTERNAL)) {
char buf1[10];
_itoa(++LaunchCnt, buf1, 10);
char buf2[20];
diff --git a/plugins/TopToolBar/ttbopt.cpp b/plugins/TopToolBar/ttbopt.cpp
index edad6b8c8a..63a342c459 100644
--- a/plugins/TopToolBar/ttbopt.cpp
+++ b/plugins/TopToolBar/ttbopt.cpp
@@ -1,5 +1,4 @@
#include "common.h"
-#include <shlobj.h>
HWND OptionshWnd = 0;