Avoid printing in empty JSON block text export

Dn-Programming-Core-Management · Dec 12, 2023 · 00a7eb8 · 00a7eb8
1 parent 2ce5ee2
commit 00a7eb8
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/Source/SoundGen.cpp b/Source/SoundGen.cpp
@@ -2450,7 +2450,7 @@ void CSoundGen::UpdateAPU()
 				UpdateAPU();
 				l.unlock();
 			}
-			else TRACE("SoundGen: APU mutex lock failed");
+			else TRACE("SoundGen: APU mutex lock failed\n");
 		}
 	}
 

diff --git a/Source/TextExporter.cpp b/Source/TextExporter.cpp
@@ -1743,16 +1743,18 @@ const CString& CTextExport::ExportFile(LPCTSTR FileName, CFamiTrackerDoc *pDoc)
 	f.WriteString(_T("# JSON block\n"));
 	{
 		json j = pDoc->InterfaceToOptionalJSON();
-		std::string &jsondump = j.dump(4, ' ', true);
-		std::string &delimiter = std::string("\n");
-		std::string::size_type pos = 0, prev = 0;
-		while ((pos = jsondump.find(delimiter, prev)) != std::string::npos) {
-			s.Format(_T("%s %s\n"), CT[CT_JSON], ExportString(jsondump.substr(prev, pos - prev).c_str()));
+		if (!j.is_null()) {
+			std::string& jsondump = j.dump(4, ' ', true);
+			std::string& delimiter = std::string("\n");
+			std::string::size_type pos = 0, prev = 0;
+			while ((pos = jsondump.find(delimiter, prev)) != std::string::npos) {
+				s.Format(_T("%s %s\n"), CT[CT_JSON], ExportString(jsondump.substr(prev, pos - prev).c_str()));
+				f.WriteString(s);
+				prev = pos + delimiter.size();
+			}
+			s.Format(_T("%s %s\n"), CT[CT_JSON], ExportString(jsondump.substr(prev).c_str()));
 			f.WriteString(s);
-			prev = pos + delimiter.size();
 		}
-		s.Format(_T("%s %s\n"), CT[CT_JSON], ExportString(jsondump.substr(prev).c_str()));
-		f.WriteString(s);
 	}
 	f.WriteString(_T("\n"));