Fix the config file saving issue.

3 files changed, 21 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a4e59bfae2de..0f64bc1064f1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = coolreader3-git
 	pkgdesc = E-book reader for Linux
 	pkgver = r4097.1e07d15
-	pkgrel = 1
+	pkgrel = 2
 	url = http://sourceforge.net/projects/crengine/
 	install = coolreader3-git.install
 	arch = i686
@@ -18,8 +18,10 @@ pkgbase = coolreader3-git
 	conflicts = coolreader3
 	source = coolreader3-git::git://git.code.sf.net/p/crengine/crengine
 	source = use_freetype2.patch
+	source = config_saving_fix.patch
 	md5sums = SKIP
 	md5sums = 390a7e6a9a1bb7ef2723176e276bd524
+	md5sums = 262b3b926956473d3cbb45602485e897
 
 pkgname = coolreader3-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 47707ff0380b..59bb99f4fae5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=coolreader3-git
 pkgver=r4097.1e07d15
-pkgrel=1
+pkgrel=2
 pkgdesc="E-book reader for Linux"
 arch=("i686" "x86_64")
 url="http://sourceforge.net/projects/crengine/"
@@ -12,8 +12,8 @@ makedepends=("git" "cmake")
 provides=("coolreader3")
 conflicts=("coolreader3")
 install="${pkgname}.install"
-source=("${pkgname}::git://git.code.sf.net/p/crengine/crengine" "use_freetype2.patch")
-md5sums=("SKIP" "390a7e6a9a1bb7ef2723176e276bd524")
+source=("${pkgname}::git://git.code.sf.net/p/crengine/crengine" "use_freetype2.patch" "config_saving_fix.patch")
+md5sums=("SKIP" "390a7e6a9a1bb7ef2723176e276bd524" "262b3b926956473d3cbb45602485e897")
 
 pkgver() {
     cd "${srcdir}/${pkgname}"
@@ -23,6 +23,7 @@ pkgver() {
 prepare() {
     cd "${srcdir}/${pkgname}"
     patch -Np1 -i "${srcdir}/use_freetype2.patch"
+    patch -Np1 -i "${srcdir}/config_saving_fix.patch"
 }
 
 build() {
diff --git a/config_saving_fix.patch b/config_saving_fix.patch
new file mode 100644
index 000000000000..44fbd98dc4b7
--- /dev/null
+++ b/config_saving_fix.patch
@@ -0,0 +1,14 @@
+--- a/cr3qt/src/cr3widget.cpp
++++ b/cr3qt/src/cr3widget.cpp
+@@ -862,7 +862,11 @@ bool CR3View::saveSettings( QString fn )
+     lString16 filename( qt2cr(fn) );
+     crtrace log;
+     if ( filename.empty() )
++#ifdef _LINUX
++        filename = qt2cr( QDir::toNativeSeparators(QDir::homePath() + "/.cr3/cr3.ini") );
++#else
+         filename = _data->_settingsFileName;
++#endif
+     if ( filename.empty() )
+         return false;
+     _data->_settingsFileName = filename;