From d1c80b38767d962ef4990d760e29d35e35cb94ce Mon Sep 17 00:00:00 2001
From: rdb <git@rdb.name>
Date: Tue, 8 May 2012 19:31:46 +0000
Subject: [PATCH] fix bug LP 996478: Resetting default mouse cursor causes
 error message popup

---
 panda/src/windisplay/winGraphicsWindow.cxx | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/panda/src/windisplay/winGraphicsWindow.cxx b/panda/src/windisplay/winGraphicsWindow.cxx
index 691dcd124d..2cfaaebdc0 100644
--- a/panda/src/windisplay/winGraphicsWindow.cxx
+++ b/panda/src/windisplay/winGraphicsWindow.cxx
@@ -2613,6 +2613,11 @@ get_icon(const Filename &filename) {
 ////////////////////////////////////////////////////////////////////
 HCURSOR WinGraphicsWindow::
 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.
   IconFilenames::iterator fi = _cursor_filenames.find(filename);
   if (fi != _cursor_filenames.end()) {