summaryrefslogtreecommitdiff
path: root/plugins/TipperYM/src
diff options
context:
space:
mode:
authorGeorge Hazan <ghazan@miranda.im>2019-07-26 11:30:13 +0300
committerGeorge Hazan <ghazan@miranda.im>2019-07-26 11:30:21 +0300
commitb68ca2a7e1035ecceb09fc1efe7529d5d8c989bf (patch)
treecb23a3a4faa8e890a072085cc625fb93b4a01892 /plugins/TipperYM/src
parentde4efd42afb991d26104aa37b8a4aa97ef7b5703 (diff)
warning fixes
Diffstat (limited to 'plugins/TipperYM/src')
-rw-r--r--plugins/TipperYM/src/bitmap_func.cpp3
-rw-r--r--plugins/TipperYM/src/options.cpp5
2 files changed, 3 insertions, 5 deletions
diff --git a/plugins/TipperYM/src/bitmap_func.cpp b/plugins/TipperYM/src/bitmap_func.cpp
index db3a24e0c7..d10a95c460 100644
--- a/plugins/TipperYM/src/bitmap_func.cpp
+++ b/plugins/TipperYM/src/bitmap_func.cpp
@@ -175,11 +175,10 @@ void CreateFromBitmaps(bool bServiceTip)
rcWidth = skin.iWidth;
rcHeight = skin.iHeight;
}
- else if (i == SKIN_ITEM_SIDEBAR) {
+ else { // SKIN_ITEM_SIDEBAR
rcWidth = opt.iSidebarWidth;
rcHeight = skin.iHeight;
}
- else rcWidth = rcHeight = 0;
// bitmap size
iBmpWidth = FreeImage_GetWidth(fib);
diff --git a/plugins/TipperYM/src/options.cpp b/plugins/TipperYM/src/options.cpp
index 214e408c78..d075a8c88d 100644
--- a/plugins/TipperYM/src/options.cpp
+++ b/plugins/TipperYM/src/options.cpp
@@ -1909,9 +1909,8 @@ INT_PTR CALLBACK DlgProcFavouriteContacts(HWND hwndDlg, UINT msg, WPARAM wParam,
}
g_plugin.setDword("FavouriteContactsCount", count);
- opt.iFavoriteContFlags = 0;
- opt.iFavoriteContFlags |= IsDlgButtonChecked(hwndDlg, IDC_CHK_HIDEOFFLINE) ? FAVCONT_HIDE_OFFLINE : 0
- | IsDlgButtonChecked(hwndDlg, IDC_CHK_APPENDPROTO) ? FAVCONT_APPEND_PROTO : 0;
+ opt.iFavoriteContFlags = (IsDlgButtonChecked(hwndDlg, IDC_CHK_HIDEOFFLINE) ? FAVCONT_HIDE_OFFLINE : 0)
+ | (IsDlgButtonChecked(hwndDlg, IDC_CHK_APPENDPROTO) ? FAVCONT_APPEND_PROTO : 0);
g_plugin.setDword("FavContFlags", opt.iFavoriteContFlags);
}