Re: rp - r23065 - abiword-plugins/branches/ABI-2-6-0-STABLE/tools/abicollab/core/session/xp

Not sure - I suppose so, but I only had this in my 2.6 tree, probably
because I hadn't gotten a trunk build in a while. It's a weird "this
shouldn't work this way" fix, but harmless.

Ryan

J.M. Maurer wrote:
> This one sounds like it should go to trunk as well, right?
>
> Marc
>
> On Thu, 2008-03-13 at 16:31 +0100, cvs@abisource.com wrote:
>
>> Author: rp
>> Date: 2008-03-13 16:31:08 +0100 (Thu, 13 Mar 2008)
>> New Revision: 23065
>>
>> Modified:
>> abiword-plugins/branches/ABI-2-6-0-STABLE/tools/abicollab/core/session/xp/AbiCollabSessionManager.cpp
>> abiword-plugins/branches/ABI-2-6-0-STABLE/tools/abicollab/core/session/xp/AbiCollabSessionManager.h
>> Log:
>> fix segfault in debug mode with AbiCollab on Windows.
>>
>> Modified: abiword-plugins/branches/ABI-2-6-0-STABLE/tools/abicollab/core/session/xp/AbiCollabSessionManager.cpp
>> ===================================================================
>> --- abiword-plugins/branches/ABI-2-6-0-STABLE/tools/abicollab/core/session/xp/AbiCollabSessionManager.cpp 2008-03-13 11:15:05 UTC (rev 23064)
>> +++ abiword-plugins/branches/ABI-2-6-0-STABLE/tools/abicollab/core/session/xp/AbiCollabSessionManager.cpp 2008-03-13 15:31:08 UTC (rev 23065)
>> @@ -96,6 +96,11 @@
>> // ... and include ourselves :)
>> #include "AbiCollabSessionManager.h"
>>
>> +#ifdef WIN32
>> +// This is ugly, but I get segfaults in debug mode if I put this function in the .h file.
>> +HINSTANCE AbiCollabSessionManager::getInstance() { return m_hModule; }
>> +#endif
>> +
>> // We, the mighty SessionManager, manage it all!
>> AbiCollabSessionManager s_AbiCollabSessionManager;
>> AbiCollabSessionManager * AbiCollabSessionManager::m_pManager = NULL;
>>
>> Modified: abiword-plugins/branches/ABI-2-6-0-STABLE/tools/abicollab/core/session/xp/AbiCollabSessionManager.h
>> ===================================================================
>> --- abiword-plugins/branches/ABI-2-6-0-STABLE/tools/abicollab/core/session/xp/AbiCollabSessionManager.h 2008-03-13 11:15:05 UTC (rev 23064)
>> +++ abiword-plugins/branches/ABI-2-6-0-STABLE/tools/abicollab/core/session/xp/AbiCollabSessionManager.h 2008-03-13 15:31:08 UTC (rev 23065)
>> @@ -69,8 +69,7 @@
>> // On Windows, we must share our HMODULE/HINSTANCE so we can do gui
>> void setInstance(HINSTANCE hModule)
>> { m_hModule = hModule; }
>> - HINSTANCE getInstance()
>> - { return m_hModule; }
>> + HINSTANCE getInstance();
>>
>> #endif
>>
>>
>>
>
>

-- 
Ryan Pavlik
www.cleardefinition.com
#282  +  (442) -  [X]
A programmer started to cuss
Because getting to sleep was a fuss
As he lay there in bed
Looping 'round in his head
was: while(!asleep()) sheep++;