diff options
Diffstat (limited to 'plugins/BossKeyPlus')
| -rw-r--r-- | plugins/BossKeyPlus/src/BossKey.cpp | 5 | ||||
| -rw-r--r-- | plugins/BossKeyPlus/src/Options.cpp | 2 | ||||
| -rw-r--r-- | plugins/BossKeyPlus/src/stdafx.h | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/plugins/BossKeyPlus/src/BossKey.cpp b/plugins/BossKeyPlus/src/BossKey.cpp index 43b09fbd89..6907c3dbdf 100644 --- a/plugins/BossKeyPlus/src/BossKey.cpp +++ b/plugins/BossKeyPlus/src/BossKey.cpp @@ -207,9 +207,8 @@ static int ChangeAllProtoStatuses(unsigned statusMode, wchar_t *msg) unsigned status = Proto_GetStatus(proto[i]->szModuleName);
if (
(g_wMask & OPT_ONLINEONLY) ? // check "Change only if current status is Online" option
- ((status == ID_STATUS_ONLINE) || (status == ID_STATUS_FREECHAT)) // process only "online" and "free for chat"
- :
- ((status > ID_STATUS_OFFLINE) && (status < ID_STATUS_IDLE) && (status != ID_STATUS_INVISIBLE))) // process all existing statuses except for "invisible" & "offline"
+ ((status == ID_STATUS_ONLINE)) // process only "online" and "free for chat"
+ : ((status > ID_STATUS_OFFLINE) && (status < ID_STATUS_IDLE) && (status != ID_STATUS_INVISIBLE))) // process all existing statuses except for "invisible" & "offline"
{
if (g_wMask & OPT_SETONLINEBACK) { // need to save old statuses & status messages
oldStatus[i] = status;
diff --git a/plugins/BossKeyPlus/src/Options.cpp b/plugins/BossKeyPlus/src/Options.cpp index ccd861cdc0..006354b216 100644 --- a/plugins/BossKeyPlus/src/Options.cpp +++ b/plugins/BossKeyPlus/src/Options.cpp @@ -111,7 +111,7 @@ public: m_chkUsrDefMsg.SetState(g_wMask & OPT_USEDEFMSG);
m_chkTrayIcon.SetState(g_wMask & OPT_TRAYICON);
- for (int i = ID_STATUS_OFFLINE; i <= ID_STATUS_OUTTOLUNCH; i++)
+ for (int i = ID_STATUS_OFFLINE; i <= ID_STATUS_MAX; i++)
m_cbStatusList.InsertString(Clist_GetStatusModeDescription(i, 0), -1);
m_cbStatusList.SetCurSel(g_plugin.getByte("stattype", 2));
diff --git a/plugins/BossKeyPlus/src/stdafx.h b/plugins/BossKeyPlus/src/stdafx.h index c8acdebd5e..1b04427190 100644 --- a/plugins/BossKeyPlus/src/stdafx.h +++ b/plugins/BossKeyPlus/src/stdafx.h @@ -86,7 +86,7 @@ struct CMPlugin : public PLUGIN<CMPlugin> #define MS_BOSSKEY_HIDE "BossKey/HideMiranda"
#define MS_BOSSKEY_ISMIRANDAHIDDEN "BossKey/IsMirandaHidden"
-const unsigned STATUS_ARR_TO_ID[8] = { ID_STATUS_OFFLINE, ID_STATUS_ONLINE, ID_STATUS_AWAY, ID_STATUS_NA, ID_STATUS_OCCUPIED, ID_STATUS_DND, ID_STATUS_FREECHAT, ID_STATUS_INVISIBLE };
+const unsigned STATUS_ARR_TO_ID[] = { ID_STATUS_OFFLINE, ID_STATUS_ONLINE, ID_STATUS_AWAY, ID_STATUS_NA, ID_STATUS_OCCUPIED, ID_STATUS_DND, ID_STATUS_INVISIBLE };
extern bool g_fOptionsOpen; // options dialog is open. be sure not to hide anything while we're there.
extern WORD g_wMask, g_wMaskAdv;
extern bool g_bWindowHidden;
|