From c89ad38ef121e08d01e7d5881e4f1c03f9519c71 Mon Sep 17 00:00:00 2001
From: RipleyTom <RipleyTom@users.noreply.github.com>
Date: Tue, 22 Oct 2019 16:05:52 +0200
Subject: [PATCH] Check if we're in the process of restarting when trying to
 open the log

---
 Utilities/Log.cpp                | 23 ++++++++++++++++++-----
 rpcs3/rpcs3qt/update_manager.cpp | 11 +++++++----
 2 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/Utilities/Log.cpp b/Utilities/Log.cpp
index 8059518141..345f7ffc99 100644
--- a/Utilities/Log.cpp
+++ b/Utilities/Log.cpp
@@ -325,16 +325,25 @@ logs::file_writer::file_writer(const std::string& name)
 	const std::string log_name = fs::get_cache_dir() + name + ".log";
 	const std::string buf_name = fs::get_cache_dir() + name + ".buf";
 
+	const std::string s_filelock = fs::get_cache_dir() + ".restart_lock";
+
 	try
 	{
 		if (!m_file.open(buf_name, fs::read + fs::rewrite + fs::lock))
 		{
 #ifdef _WIN32
-			// Windows does not close all handles before starting a new process with execl
-			// We delay another check for rpcs3 restart after an update
-			// TODO: cleaner solution?
-			std::this_thread::sleep_for(500ms);
-			if (!m_file.open(buf_name, fs::read + fs::rewrite + fs::lock))
+			if (fs::exists(s_filelock))
+			{
+				// A restart is happening, wait for the file to be accessible
+				u32 tries = 0;
+				while (!m_file.open(buf_name, fs::read + fs::rewrite + fs::lock) && tries < 100)
+				{
+					std::this_thread::sleep_for(100ms);
+					tries++;
+				}
+			}
+
+			if (!m_file)
 #endif
 			{
 				if (fs::g_tls_error == fs::error::acces)
@@ -359,6 +368,10 @@ logs::file_writer::file_writer(const std::string& name)
 			}
 		}
 
+#ifdef _WIN32
+		fs::remove_file(s_filelock); // remove restart token if it exists
+#endif
+
 		// Check free space
 		fs::device_stat stats{};
 		if (!fs::statfs(fs::get_cache_dir(), stats) || stats.avail_free < s_log_size * 8)
diff --git a/rpcs3/rpcs3qt/update_manager.cpp b/rpcs3/rpcs3qt/update_manager.cpp
index 2f9d254b8d..2c9e110caf 100644
--- a/rpcs3/rpcs3qt/update_manager.cpp
+++ b/rpcs3/rpcs3qt/update_manager.cpp
@@ -73,8 +73,8 @@ void update_manager::handle_error(QNetworkReply::NetworkError error)
 {
 	if (error != QNetworkReply::NoError)
 	{
-		QNetworkReply* reply = qobject_cast<QNetworkReply *>(sender());
-		if(!reply)
+		QNetworkReply* reply = qobject_cast<QNetworkReply*>(sender());
+		if (!reply)
 			return;
 
 		m_progress_dialog->close();
@@ -543,13 +543,16 @@ bool update_manager::handle_rpcs3(const QByteArray& rpcs3_data, bool automatic)
 
 	replace_path = Emulator::GetEmuDir() + "rpcs3.exe";
 
+	// Creating a file to indicate we're restarting
+	const std::string s_filelock = fs::get_cache_dir() + ".restart_lock";
+	verify("Restart lock" HERE), !!fs::file(s_filelock, fs::create);
+
 #endif
 
 	m_progress_dialog->close();
-
 	QMessageBox::information(m_parent, tr("Auto-updater"), tr("Update successful!"));
-	int ret = execl(replace_path.c_str(), replace_path.c_str(), nullptr);
 
+	int ret = execl(replace_path.c_str(), replace_path.c_str(), nullptr);
 	if (ret == -1)
 	{
 		LOG_ERROR(GENERAL, "[Auto-updater] Relaunching failed with result: %d(%s)", ret, strerror(errno));