From 74064d1fdf2f8074436879d6082485c5396dc27f Mon Sep 17 00:00:00 2001
From: Krad <kradchen123@163.com>
Date: Fri, 10 Jun 2022 15:37:28 +0800
Subject: [PATCH] 10 volunteer study prepare fix.

---
 src/forms/settings/aboutwidget.cpp | 15 ++++++++-------
 src/json/jsonobject.cpp            | 19 ++++++++++++++-----
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/src/forms/settings/aboutwidget.cpp b/src/forms/settings/aboutwidget.cpp
index a899b62..01c41dd 100644
--- a/src/forms/settings/aboutwidget.cpp
+++ b/src/forms/settings/aboutwidget.cpp
@@ -167,13 +167,14 @@ void AboutWidget::initUi()
 
 void AboutWidget::openHelpFile()
 {
-	QString userManulFile = QCoreApplication::applicationDirPath() + "/userManual.pdf";
-
-	QFileInfo file(userManulFile);
-	if (file.exists())
-	{
-		QDesktopServices::openUrl(QUrl::fromLocalFile(userManulFile));
-	}
+    qApp->exit();
+//	QString userManulFile = QCoreApplication::applicationDirPath() + "/userManual.pdf";
+//
+//	QFileInfo file(userManulFile);
+//	if (file.exists())
+//	{
+//		QDesktopServices::openUrl(QUrl::fromLocalFile(userManulFile));
+//	}
 	//else
 	//{
 	//	EQ9MessageBox box;
diff --git a/src/json/jsonobject.cpp b/src/json/jsonobject.cpp
index 0509805..e615c9e 100644
--- a/src/json/jsonobject.cpp
+++ b/src/json/jsonobject.cpp
@@ -7,6 +7,7 @@
 #include <QTranslator>
 #include <QDebug>
 #include <QApplication>
+#include <iostream>
 #include "json/cJSON.h"
 const char* strProductFileName = "./cfgs/usct-product.json";
 const char* strProductFileNameDefault = "./cfgs/usct-product";
@@ -338,11 +339,19 @@ bool JsonObject::savecfg()
 	}
 
 	char* strJsonData = cJSON_Print((cJSON*)json_root);
-	std::stringstream ss;
-	ss << strJsonData;
-	outFile << ss.rdbuf();
-	outFile.close();
-	m_bLoaded = false;
+	if (strlen(strJsonData)>1){
+        std::stringstream ss;
+        ss << strJsonData;
+        outFile << ss.rdbuf();
+        outFile.flush();
+        outFile.close();
+        m_bLoaded = false;
+	}
+	else{
+	    std::cout<<"===========================================app want write empty content to cfg json============================================="<<std::endl;
+
+	}
+	delete strJsonData;
 	return true;
 }