[PATCH] fix bug 854, 855

[John Levon]

Please give this a test. It fixes a critical crash and a serious
problem.

It seems to work fine for me. Lars, OK ?

Michael K has already given this a run.

regards
john


Index: QPrefs.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QPrefs.C,v
retrieving revision 1.20
diff -u -r1.20 QPrefs.C
--- QPrefs.C    19 Dec 2002 03:22:33 -0000      1.20
+++ QPrefs.C    2 Feb 2003 00:58:33 -0000
@@ -261,8 +261,8 @@
                controller().updateScreenFonts();
        }
 
-       controller().setConverters(converters_);
        controller().setFormats(formats_);
+       controller().setConverters(converters_);
 
        QPrefColorsModule * colmod(dialog_->colorsModule);
 
Index: QPrefsDialog.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/qt2/QPrefsDialog.C,v
retrieving revision 1.20
diff -u -r1.20 QPrefsDialog.C
--- QPrefsDialog.C      14 Jan 2003 21:51:33 -0000      1.20
+++ QPrefsDialog.C      2 Feb 2003 00:58:34 -0000
@@ -357,6 +357,9 @@
                        ccit->To->prettyname());
                convertmod->convertersLB->insertItem(toqstr(name));
        }
+
+       if (convertmod->convertersLB->currentItem() == -1)
+               convertmod->convertersLB->setCurrentItem(0);
 }
 
 
@@ -423,6 +426,9 @@
        for (; cit != end; ++cit) {
                formatmod->formatsLB->insertItem(toqstr(cit->prettyname()));
        }
+
+       if (formatmod->formatsLB->currentItem() == -1)
+               formatmod->formatsLB->setCurrentItem(0);
 }