From dde8a903731848145c6f05a51aea57771c2ef006 Mon Sep 17 00:00:00 2001 From: Vadim Dashevskiy Date: Fri, 21 Sep 2012 21:15:34 +0000 Subject: Check if Toptoolbar already in the plugin list git-svn-id: http://svn.miranda-ng.org/main/trunk@1628 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Clist_modern/src/hdr/modern_commonheaders.h | 1 + plugins/Clist_modern/src/modern_toolbar.cpp | 9 +++++---- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'plugins/Clist_modern') diff --git a/plugins/Clist_modern/src/hdr/modern_commonheaders.h b/plugins/Clist_modern/src/hdr/modern_commonheaders.h index 0fd21dffd8..d577b431a7 100644 --- a/plugins/Clist_modern/src/hdr/modern_commonheaders.h +++ b/plugins/Clist_modern/src/hdr/modern_commonheaders.h @@ -111,6 +111,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include #include #include +#include #include "modern_clc.h" #include "modern_clist.h" diff --git a/plugins/Clist_modern/src/modern_toolbar.cpp b/plugins/Clist_modern/src/modern_toolbar.cpp index 9118a60a65..9b7101b216 100644 --- a/plugins/Clist_modern/src/modern_toolbar.cpp +++ b/plugins/Clist_modern/src/modern_toolbar.cpp @@ -346,10 +346,11 @@ HRESULT ToolbarLoadModule() CallService(MS_DB_MODULE_DELETE, 0, (LPARAM)"ModernToolBar"); - if (bOldSetting == 1) - if (IDYES == MessageBox(NULL, TranslateTS(szWarning), TranslateT("Toolbar upgrade"), MB_ICONQUESTION | MB_YESNO)) - CallService(MS_UTILS_OPENURL, 0, (LPARAM)szUrl); - } + if ( !ServiceExists( MS_TTB_REMOVEBUTTON)) { + if (bOldSetting == 1) + if (IDYES == MessageBox(NULL, TranslateTS(szWarning), TranslateT("Toolbar upgrade"), MB_ICONQUESTION | MB_YESNO)) + CallService(MS_UTILS_OPENURL, 0, (LPARAM)szUrl); + } } ehhToolBarBackgroundSettingsChanged(0,0); HookEvent(ME_SYSTEM_MODULESLOADED, Toolbar_ModulesLoaded); -- cgit v1.2.3