diff options
| author | George Hazan <george.hazan@gmail.com> | 2012-07-29 09:00:51 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2012-07-29 09:00:51 +0000 |
| commit | 4579351044c7c214e44c35816a9ac0934b7ecdf4 (patch) | |
| tree | 4525f22f7d4b91d0b436e310003585658002f2bd | |
| parent | 1b42f0a02a8d51c279c19ed7abac45c4cf964976 (diff) | |
fix for mishmash in the protocol load order
git-svn-id: http://svn.miranda-ng.org/main/trunk@1239 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
| -rw-r--r-- | plugins/Import/src/miranda.cpp | 8 | ||||
| -rw-r--r-- | src/modules/plugins/newplugins.cpp | 8 |
2 files changed, 10 insertions, 6 deletions
diff --git a/plugins/Import/src/miranda.cpp b/plugins/Import/src/miranda.cpp index 9e809975a7..33bd6964c1 100644 --- a/plugins/Import/src/miranda.cpp +++ b/plugins/Import/src/miranda.cpp @@ -133,7 +133,7 @@ INT_PTR CALLBACK MirandaPageProc(HWND hdlg,UINT message,WPARAM wParam,LPARAM lPa break;
case IDC_LIST:
- if(HIWORD(wParam)==LBN_SELCHANGE) {
+ if (HIWORD(wParam)==LBN_SELCHANGE) {
int sel = SendDlgItemMessage(hdlg, IDC_LIST, LB_GETCURSEL, 0, 0);
if (sel == LB_ERR) break;
SetDlgItemText(hdlg, IDC_FILENAME, (TCHAR*)SendDlgItemMessage(hdlg, IDC_LIST, LB_GETITEMDATA, sel, 0));
@@ -200,7 +200,7 @@ INT_PTR CALLBACK MirandaOptionsPageProc(HWND hdlg,UINT message,WPARAM wParam,LPA break;
case IDOK:
- if(IsDlgButtonChecked(hdlg,IDC_RADIO_ALL)) {
+ if (IsDlgButtonChecked(hdlg,IDC_RADIO_ALL)) {
nImportOption = IMPORT_ALL;
nCustomOptions = 0;//IOPT_MSGSENT|IOPT_MSGRECV|IOPT_URLSENT|IOPT_URLRECV;
DoImport = MirandaImport;
@@ -208,7 +208,7 @@ INT_PTR CALLBACK MirandaOptionsPageProc(HWND hdlg,UINT message,WPARAM wParam,LPA break;
}
- if(IsDlgButtonChecked(hdlg,IDC_RADIO_CONTACTS)) {
+ if (IsDlgButtonChecked(hdlg,IDC_RADIO_CONTACTS)) {
nImportOption = IMPORT_CONTACTS;
nCustomOptions = 0;
DoImport = MirandaImport;
@@ -216,7 +216,7 @@ INT_PTR CALLBACK MirandaOptionsPageProc(HWND hdlg,UINT message,WPARAM wParam,LPA break;
}
- if(IsDlgButtonChecked(hdlg,IDC_RADIO_CUSTOM)) {
+ if (IsDlgButtonChecked(hdlg,IDC_RADIO_CUSTOM)) {
PostMessage(GetParent(hdlg),WIZM_GOTOPAGE,IDD_ADVOPTIONS,(LPARAM)MirandaAdvOptionsPageProc);
break;
}
diff --git a/src/modules/plugins/newplugins.cpp b/src/modules/plugins/newplugins.cpp index 7bdd1d87b1..f583b2aa09 100644 --- a/src/modules/plugins/newplugins.cpp +++ b/src/modules/plugins/newplugins.cpp @@ -103,9 +103,13 @@ bool hasMuuid(const BASIC_PLUGIN_INFO& bpi, const MUUID& uuid) int getDefaultPluginIdx(const MUUID& muuid)
{
- for (int i=0; i < SIZEOF(pluginDefault); i++)
+ for (int i=0; i < SIZEOF(pluginDefault); i++) {
+ if (pluginDefault[i].stdplugname == NULL)
+ break;
+
if (equalUUID(muuid, pluginDefault[i].uuid))
return i;
+ }
return -1;
}
@@ -479,7 +483,7 @@ bool TryLoadPlugin(pluginEntry *p, bool bDynamic) SetPluginOnWhiteList(p->pluginname, 0);
return false;
}
- if ( !(p->pclass & PCLASS_CORE)) {
+ if (bDynamic && !(p->pclass & PCLASS_CORE)) {
Plugin_UnloadDyn(pluginDefault[idx].pImpl);
pluginDefault[idx].pImpl = NULL;
} } } }
|