From 70ccdb11b262b59b56234b13ecc0a66819dbcc0d Mon Sep 17 00:00:00 2001
From: Andrea Scarpino <me@andreascarpino.it>
Date: Sat, 12 Sep 2015 19:06:21 +0200
Subject: [PATCH] Fix regression that wipe content when app is sent to
 background

---
 src/main.cpp                      | 3 ++-
 translations/harbour-papocchio.ts | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 8690245..b02052b 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -29,6 +29,8 @@ int main(int argc, char *argv[])
 
     QCoreApplication::setApplicationName(QStringLiteral("Papocchio"));
 
+    view->setSource(SailfishApp::pathTo("qml/Papocchio.qml"));
+
     // Otherwise the Canvas is cleaned when the application is not
     // marked as active. See for more:
     // https://lists.sailfishos.org/pipermail/devel/2014-October/005065.html
@@ -37,7 +39,6 @@ int main(int argc, char *argv[])
 
     view->rootContext()->setContextProperty("papocchioDir", papocchioDir());
 
-    view->setSource(SailfishApp::pathTo("qml/Papocchio.qml"));
     view->show();
 
     return app->exec();
diff --git a/translations/harbour-papocchio.ts b/translations/harbour-papocchio.ts
index 7b9a42a..54d2c92 100644
--- a/translations/harbour-papocchio.ts
+++ b/translations/harbour-papocchio.ts
@@ -12,12 +12,12 @@
 <context>
     <name>MainPage</name>
     <message>
-        <location filename="../qml/pages/MainPage.qml" line="98"/>
+        <location filename="../qml/pages/MainPage.qml" line="96"/>
         <source>Saving the canvas...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/pages/MainPage.qml" line="114"/>
+        <location filename="../qml/pages/MainPage.qml" line="112"/>
         <source>Clearing the canvas...</source>
         <translation type="unfinished"></translation>
     </message>