瀏覽代碼

fix bug LP 996478: Resetting default mouse cursor causes error message popup

rdb 13 年之前
父節點
當前提交
d1c80b3876
共有 1 個文件被更改,包括 5 次插入0 次删除
  1. 5 0
      panda/src/windisplay/winGraphicsWindow.cxx

+ 5 - 0
panda/src/windisplay/winGraphicsWindow.cxx

@@ -2613,6 +2613,11 @@ get_icon(const Filename &filename) {
 ////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////
 HCURSOR WinGraphicsWindow::
 HCURSOR WinGraphicsWindow::
 get_cursor(const Filename &filename) {
 get_cursor(const Filename &filename) {
+  // The empty filename means to disable a custom cursor.
+  if (filename.empty()) {
+    return 0;
+  }
+
   // First, look for the unresolved filename in our index.
   // First, look for the unresolved filename in our index.
   IconFilenames::iterator fi = _cursor_filenames.find(filename);
   IconFilenames::iterator fi = _cursor_filenames.find(filename);
   if (fi != _cursor_filenames.end()) {
   if (fi != _cursor_filenames.end()) {