Merge tag 'upstream/3.0.7'

Upstream version 3.0.7

# gpg: Signature made Wed 25 Nov 2015 04:48:48 PM EST using RSA key ID EBE9BD91
# gpg: Good signature from "Unit 193 <unit193@gmail.com>"
# gpg:                 aka "Unit 193 <unit193@ninthfloor.org>"
# gpg:                 aka "Unit 193 <unit193@ubuntu.com>"
# gpg:                 aka "Unit 193 <unit193@ninthfloor.com>"

1 files changed, 13 insertions, 0 deletions

diff --git a/SQLiteStudio3/guiSQLiteStudio/mainwindow.cpp b/SQLiteStudio3/guiSQLiteStudio/mainwindow.cpp
index 4691dda..fb5c7b5 100644
--- a/SQLiteStudio3/guiSQLiteStudio/mainwindow.cpp
+++ b/SQLiteStudio3/guiSQLiteStudio/mainwindow.cpp
@@ -156,6 +156,8 @@ void MainWindow::init()
 #endif
 
     connect(CFG_CORE.General.Language, SIGNAL(changed(QVariant)), this, SLOT(notifyAboutLanguageChange()));
+
+    fixFonts();
 }
 
 void MainWindow::cleanUp()
@@ -843,6 +845,17 @@ BugReportHistoryWindow* MainWindow::openReportHistory()
     return openMdiWindow<BugReportHistoryWindow>();
 }
 
+void MainWindow::fixFonts()
+{
+    CfgTypedEntry<QFont>* typed = nullptr;
+    for (CfgEntry* cfg : CFG_UI.Fonts.getEntries())
+    {
+        typed = dynamic_cast<CfgTypedEntry<QFont>*>(cfg);
+        if (typed->get().pointSize() == 0)
+            cfg->set(cfg->getDefultValue());
+    }
+}
+
 bool MainWindow::confirmQuit(const QList<Committable*>& instances)
 {
     QuitConfirmDialog dialog(MAINWINDOW);