# HG changeset patch
# User alfadur
# Date 1538790228 14400
# Node ID 5df16be168ffb03eb3d4815e4b341e05da46aea3
# Parent  26ebbf9717fdedf9f1c3d241ebbe01e5b877fdc4# Parent  a966b1914792ce3b1e611017b8c23a9e9e87c4bb
merge

diff -r 26ebbf9717fd -r 5df16be168ff QTfrontend/util/FileEngine.cpp
--- a/QTfrontend/util/FileEngine.cpp	Sat Oct 06 00:23:27 2018 +0200
+++ b/QTfrontend/util/FileEngine.cpp	Fri Oct 05 21:43:48 2018 -0400
@@ -313,8 +313,10 @@
 
 FileEngineHandler::FileEngineHandler(char *argv0)
 {
-    PHYSFS_init(argv0);
-
+    if (!PHYSFS_init(argv0))
+    {
+        qDebug("PHYSFS initialization failed");
+    }
     qDebug("%s", QString("[PHYSFS] Init: %1").arg(errorStr()).toLocal8Bit().constData());
 }
 
diff -r 26ebbf9717fd -r 5df16be168ff misc/libphysfs/platform_windows.c
--- a/misc/libphysfs/platform_windows.c	Sat Oct 06 00:23:27 2018 +0200
+++ b/misc/libphysfs/platform_windows.c	Fri Oct 05 21:43:48 2018 -0400
@@ -435,7 +435,7 @@
         GOTO_MACRO(errcodeFromWinApi(), done);
     else
     {
-        DWORD psize = 0;
+        DWORD psize = 1;
         WCHAR dummy = 0;
         LPWSTR wstr = NULL;
         BOOL rc = 0;