From: Włodzimierz Skiba <abx@abx.art.pl>
Date: Fri, 24 Jun 2005 15:55:10 +0000 (+0000)
Subject: Preserve logging state during QT plugin initialization.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/3131207f4ef0e4e5c8b6bdedb74bc66271ae3787

Preserve logging state during QT plugin initialization.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34754 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/msw/mediactrl.cpp b/src/msw/mediactrl.cpp
index 2709461f4e..5e096cdf62 100644
--- a/src/msw/mediactrl.cpp
+++ b/src/msw/mediactrl.cpp
@@ -742,7 +742,7 @@ struct TimeRecord {
 
 #define wxDL_METHOD_LOAD( lib, name, success ) \
     pfn_ ## name = (name ## Type) lib.GetSymbol( wxT(#name), &success ); \
-    if (!success) { wxLog::EnableLogging(true); return false; }
+    if (!success) { wxLog::EnableLogging(bWasLoggingEnabled); return false; }
 
 
 //Class that utilizes Robert Roeblings Dynamic Library Macros
@@ -829,11 +829,11 @@ bool wxQuickTimeLibrary::Initialize()
 {
     m_ok = false;
 
-    wxLog::EnableLogging(false);    //Turn off the wxDynamicLibrary logging
+    bool bWasLoggingEnabled = wxLog::EnableLogging(false);    //Turn off the wxDynamicLibrary logging
 
     if(!m_dll.Load(wxT("qtmlClient.dll")))
     {
-        wxLog::EnableLogging(true);
+        wxLog::EnableLogging(bWasLoggingEnabled);
         return false;
     }
 
@@ -875,7 +875,7 @@ bool wxQuickTimeLibrary::Initialize()
     wxDL_METHOD_LOAD( m_dll, GetMovieVolume, bOk );
     wxDL_METHOD_LOAD( m_dll, SetMovieVolume, bOk );
 
-    wxLog::EnableLogging(true);
+    wxLog::EnableLogging(bWasLoggingEnabled);
     m_ok = true;
 
     return true;