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

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
>
>
> -----------------------------------------------
> To unsubscribe from this list, send a message to
> abisource-cvs-commit-request@abisource.com with the word
> unsubscribe in the message body.
Received on Sat Mar 15 16:45:56 2008