瀏覽代碼

Merge branch 'release/1.10.x'

rdb 3 年之前
父節點
當前提交
0421ee31b3
共有 2 個文件被更改,包括 6 次插入2 次删除
  1. 4 0
      dtool/src/dtoolutil/executionEnvironment.cxx
  2. 2 2
      makepanda/pview.desktop

+ 4 - 0
dtool/src/dtoolutil/executionEnvironment.cxx

@@ -418,6 +418,10 @@ ns_get_environment_variable(const string &var) const {
   } else if (var == "XDG_DATA_HOME") {
   } else if (var == "XDG_DATA_HOME") {
     Filename home_dir = Filename::get_home_directory();
     Filename home_dir = Filename::get_home_directory();
     return home_dir.get_fullpath() + "/.local/share";
     return home_dir.get_fullpath() + "/.local/share";
+
+  } else if (var == "XDG_STATE_HOME") {
+    Filename home_dir = Filename::get_home_directory();
+    return home_dir.get_fullpath() + "/.local/state";
   }
   }
 #endif // _WIN32
 #endif // _WIN32
 
 

+ 2 - 2
makepanda/pview.desktop

@@ -3,8 +3,8 @@ Name=Panda3D Model Viewer
 GenericName=Model Viewer
 GenericName=Model Viewer
 Comment=View Panda3D model files
 Comment=View Panda3D model files
 TryExec=pview
 TryExec=pview
-Exec=pview %U
-StartupNotify=true
+Exec=pview %F
+StartupNotify=false
 NoDisplay=true
 NoDisplay=true
 Terminal=true
 Terminal=true
 Type=Application
 Type=Application