Changeset 4863 for trunk/qt-gui/src/mainwin.cpp

Timestamp:

03/10/07 19:35:15 (21 months ago)

Author:

flynd

Message:

Set default encoding before the floaties try to use it. Fix for #1500.

Files:

• trunk/qt-gui/src/mainwin.cpp (modified) (2 diffs)

trunk/qt-gui/src/mainwin.cpp

@@ -549 +549 @@
   }
 
+  // all settings relating to localization
+  licqConf.SetSection("locale");
+  licqConf.ReadStr("DefaultEncoding", szTemp, "");
+  m_DefaultEncoding = QString::fromLatin1(szTemp);
+  uc_DefaultEncoding = &m_DefaultEncoding;
+  licqConf.ReadBool("ShowAllEncodings", m_bShowAllEncodings, false);
+
   // Load the icons
   licqConf.SetSection("appearance");
@@ -720 +727 @@
 #endif
   }
-
-   // all settings relating to localization
-   licqConf.SetSection("locale");
-   licqConf.ReadStr("DefaultEncoding", szTemp, "");
-   m_DefaultEncoding = QString::fromLatin1(szTemp);
-   uc_DefaultEncoding = &m_DefaultEncoding;
-   licqConf.ReadBool("ShowAllEncodings", m_bShowAllEncodings, false);
 
    autoAwayTimer.start(10000);  // start the inactivity timer for auto away