[X2Go-Commits] [x2goclient] 04/08: onmainwindow.cpp: copy strings before manipulating them.
git-admin at x2go.org
git-admin at x2go.org
Mon May 11 07:02:31 CEST 2015
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch bugfix/translation
in repository x2goclient.
commit 351e4052aceca6d03839d230305b11cc6e2618ae
Author: Mihai Moldovan <ionic at ionic.de>
Date: Mon May 11 06:57:39 2015 +0200
onmainwindow.cpp: copy strings before manipulating them.
---
debian/changelog | 1 +
src/onmainwindow.cpp | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 4af8f1c..81c497e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -388,6 +388,7 @@ x2goclient (4.0.4.0-0x2go1) UNRELEASED; urgency=low
typo in implementation.
- onmainwindow.h: include used types/headers.
- onmainwindow.cpp: correctly call QLocale::uiLanguages ().
+ - onmainwindow.cpp: copy strings before manipulating them.
[ Fernando Pedemonte ]
* New upstream release (4.0.4.0):
diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp
index 39cbbb1..df555b8 100644
--- a/src/onmainwindow.cpp
+++ b/src/onmainwindow.cpp
@@ -589,7 +589,8 @@ bool ONMainWindow::get_translator (QString file_name_start, QTranslator **transl
break;
}
else {
- load_filename = filename.append ("_").append (*it);
+ load_filename = filename;
+ load_filename.append ("_").append (*it);
if (tmp_ranslator->load (load_filename) {
/* Some translation successfully loaded. That's good enough. */
--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
More information about the x2go-commits
mailing list