summaryrefslogtreecommitdiff
path: root/office/coolreader/inifile.diff
blob: 9290599e6931208b9f19d0c157a0ed55e03bb022 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
diff -Naur cr3.0.56-7/cr3qt/src/mainwindow.cpp cr3.0.56-7.patched/cr3qt/src/mainwindow.cpp
--- cr3.0.56-7/cr3qt/src/mainwindow.cpp	2012-03-21 01:39:19.000000000 -0400
+++ cr3.0.56-7.patched/cr3qt/src/mainwindow.cpp	2020-01-26 19:26:09.590595122 -0500
@@ -79,7 +79,6 @@
     QString bookmarksDir = homeDir + "bookmarks";
     QString histFile = exeDir + "cr3hist.bmk";
     QString histFile2 = homeDir + "cr3hist.bmk";
-    QString iniFile2 = exeDir + "cr3.ini";
     QString iniFile = homeDir + "cr3.ini";
     QString cssFile = homeDir + "fb2.css";
     QString cssFile2 = exeDir + "fb2.css";
@@ -91,8 +90,7 @@
 
     ldomDocCache::init( qt2cr( cacheDir ), DOC_CACHE_SIZE );
     ui->view->setPropsChangeCallback( this );
-    if ( !ui->view->loadSettings( iniFile ) )
-        ui->view->loadSettings( iniFile2 );
+    ui->view->loadSettings( iniFile );
     if ( !ui->view->loadHistory( histFile ) )
         ui->view->loadHistory( histFile2 );
     if ( !ui->view->loadCSS( cssFile ) )