Fixed note overwriting in special cases

tsujan · Jun 22, 2024 · eb32448 · eb32448
1 parent 76aa3b4
commit eb32448
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 5 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,5 +1,6 @@
-V1.2.1
+V1.3.0
 ---------
+ * Fixed a nasty bug that could cause note overwriting in special cases.
  * Added a workaround for window deactivation on clicking the tray icon under Wayland.
  * Added a workaround for on-the-fly style change of Qt6.
  * Dropped using of "gio" for opening hyperlinks.

diff --git a/NEWS b/NEWS
@@ -1,5 +1,5 @@
 Latest version:
 
-	10 Jun 2024, V1.2.1
+	23 Jun 2024, V1.3.0
 
 See "ChangeLog" for changes.
diff --git a/feathernotes/fn.cpp b/feathernotes/fn.cpp
@@ -5374,7 +5374,7 @@ void FN::readAndApplyConfig (bool startup)
     }
 
     openLastFile_ = settings.value ("openLastFile").toBool(); // false by default
-    if (openLastFile_)
+    if (startup && openLastFile_)
     {
         xmlPath_ = settings.value ("lastOpenedFile").toString();
         static_cast<FNSingleton*>(qApp)->setLastFile (xmlPath_);

diff --git a/feathernotes/main.cpp b/feathernotes/main.cpp
@@ -28,7 +28,7 @@
 int main(int argc, char *argv[])
 {
     const QString name = "FeatherNotes";
-    const QString version = "1.2.1";
+    const QString version = "1.3.0";
     const QString option = QString::fromUtf8 (argv[1]);
     if (option == "--help" || option == "-h")
     {

diff --git a/feathernotes/textedit.cpp b/feathernotes/textedit.cpp
@@ -17,7 +17,7 @@
 
 #include "textedit.h"
 #include <QDesktopServices>
-#include <QProcess>
+//#include <QProcess>
 #include <QToolTip>
 #include <QTimer>
 #include <QTextBlock>