Changeset 170 for smplayer/trunk/src/prefsubtitles.cpp

Timestamp:

Oct 9, 2014, 2:54:21 PM (11 years ago)

Author:

Silvan Scherrer

Message:

SMPlayer: updated trunk to 14.9.0

Location:

smplayer/trunk

Files:

• . (modified) (1 prop)
• src/prefsubtitles.cpp (modified) (1 diff)

smplayer/trunk/src/prefsubtitles.cpp

@@ -425 +425 @@
         if (b) {
                 style_font_combo->setFontsFromDir(QString::null);
+                fontCombo->setFontsFromDir(QString::null);
         } else {
                 QString fontdir = Paths::fontPath();
                 //QString fontdir = "/tmp/fonts/";
                 style_font_combo->setFontsFromDir(fontdir);
+
+                // Calling setFontsFromDir resets the fonts in other comboboxes!
+                // So the font list is copied from the previous combobox
+                QString current_text = fontCombo->currentText();
+                fontCombo->clear();
+                for (int n=0; n < style_font_combo->count(); n++) {
+                        fontCombo->addItem( style_font_combo->itemText(n) );
+                }
+                fontCombo->setCurrentText(current_text);
         }
 #endif