#1938 #1936

Author: Robosturm

CMakeLists.txt

@@ -215,15 +215,15 @@ endif()
 add_definitions(
     -DVERSION_MAJOR=0
     -DVERSION_MINOR=38
-    -DVERSION_REVISION=4
+    -DVERSION_REVISION=5
     -DVERSION_SUFFIX="main"
     -DCOW_BUILD_TAG="${COW_BUILD_TAG}"
     -DCOW_BUILD_NAME="${COW_BUILD_NAME}"
     -DUPDATE_FILE="${UPDATE_FILE}"
 )
 
-set(COW_ANDROID_VERSION_NAME "0.38.4-main")
-set(COW_ANDROID_VERSION_CODE "65")
+set(COW_ANDROID_VERSION_NAME "0.38.5-main")
+set(COW_ANDROID_VERSION_CODE "66")
 
 ###################################################################################
 # Set up some compiler and linking options

menue/editormenue.cpp

@@ -246,9 +246,19 @@ void EditorMenue::cleanTemp(qint32 step)
     QDir dir = m_tempDir.path();
     if (step < 0)
     {
-        m_tempCounter = 0;
-        dir.removeRecursively();
         dir.mkpath(".");
+        for (qint32 i = 0; i < std::numeric_limits<qint32>::max(); i++)
+        {
+            QFile file(m_tempDir.path() + "/temp" + QString::number(i) + ".tmp");
+            if (file.exists())
+            {
+                file.remove();
+            }
+            else
+            {
+                break;
+            }
+        }
     }
     else
     {
@@ -1743,6 +1753,7 @@ void EditorMenue::loadMap(QString filename)
     CONSOLE_PRINT("EditorMenue::loadMap " + filename, GameConsole::eDEBUG);
     if (filename.endsWith(".map"))
     {
+        filename = filename.replace("//", "/");
         QFile file(filename);
         if (file.exists())
         {

objects/dialogs/filedialog.cpp

@@ -123,6 +123,10 @@ void FileDialog::onFileSelected()
     {
         fileStart = folder;
     }
+    else
+    {
+        fileStart += folder;
+    }
     if (!fileStart.isEmpty())
     {
         fileStart += "/";