summaryrefslogtreecommitdiff
path: root/src/core/stdidle
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2013-03-21 20:43:46 +0000
committerGeorge Hazan <george.hazan@gmail.com>2013-03-21 20:43:46 +0000
commit6f2c99a32c9e539fc61edb6b836e8805b013a180 (patch)
treeb0108fbaf865ad5dc7522a55f8ca272bf0df7600 /src/core/stdidle
parent365b792d3509d4e94cdc31ee4384bf458f152e59 (diff)
- unused constant MIRANDA_IDLE_INFO_SIZE_1 removed;
- proper tracking of autoaway sound options; - code cleanup for MIRANDA_IDLE_INFO initialization; git-svn-id: http://svn.miranda-ng.org/main/trunk@4156 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'src/core/stdidle')
-rw-r--r--src/core/stdidle/idle.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/core/stdidle/idle.cpp b/src/core/stdidle/idle.cpp
index fc547c8b92..3f73f6511f 100644
--- a/src/core/stdidle/idle.cpp
+++ b/src/core/stdidle/idle.cpp
@@ -460,7 +460,7 @@ static int IdleOptInit(WPARAM wParam, LPARAM)
static INT_PTR IdleGetInfo(WPARAM, LPARAM lParam)
{
MIRANDA_IDLE_INFO *mii = (MIRANDA_IDLE_INFO*)lParam;
- if ( !mii || (mii->cbSize != sizeof(MIRANDA_IDLE_INFO) && mii->cbSize != MIRANDA_IDLE_INFO_SIZE_1))
+ if ( !mii || mii->cbSize != sizeof(MIRANDA_IDLE_INFO))
return 1;
mii->idleTime = gIdleObject.minutes;
@@ -468,9 +468,7 @@ static INT_PTR IdleGetInfo(WPARAM, LPARAM lParam)
mii->aaStatus = gIdleObject.aastatus;
mii->aaLock = gIdleObject.state&0x20;
mii->idlesoundsoff = gIdleObject.aasoundsoff;
-
- if (mii->cbSize == sizeof(MIRANDA_IDLE_INFO))
- mii->idleType = gIdleObject.idleType;
+ mii->idleType = gIdleObject.idleType;
return 0;
}