From b8d3c9870975ad6e7faf3f0e81705d0a6fcec8f5 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 26 Jun 2012 15:46:24 +0000 Subject: fix against separators multiplication git-svn-id: http://svn.miranda-ng.org/main/trunk@638 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/TopToolBar/topbutton.cpp | 4 ++-- plugins/TopToolBar/ttbopt.cpp | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'plugins/TopToolBar') 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 HWND OptionshWnd = 0; -- cgit v1.2.3