Fix for GLUI_List double-click callback

libglui · Oct 3, 2017 · ad0f3a8 · ad0f3a8
1 parent 6358144
commit ad0f3a8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/glui_list.cpp b/glui_list.cpp
@@ -102,7 +102,7 @@ void GLUI_List::common_construct(
 int    GLUI_List::mouse_down_handler( int local_x, int local_y )
 {
   int tmp_line;
-  unsigned long int ms;
+  uint64_t ms;
   timeb time;
   ftime(&time);
   ms = time.millitm + (time.time)*1000;
@@ -126,7 +126,7 @@ int    GLUI_List::mouse_down_handler( int local_x, int local_y )
           obj_cb(this);
         }
       } else {
-        if (last_line == curr_line && (ms - last_click_time) < 300) {
+        if (last_line == curr_line && last_click_time && (ms - last_click_time) < 300) {
           //obj_cb(associated_object, user_id);
           obj_cb(this);
         } else {

diff --git a/include/GL/glui.h b/include/GL/glui.h
@@ -44,6 +44,7 @@
 
 #include <cstdlib>
 #include <cstdio>
+#include <cstdint>
 #include <cstring>
 
 #include <array>
@@ -2031,7 +2032,7 @@ class GLUIAPI GLUI_List : public GLUI_Control
     GLUI_CB             obj_cb;
     int                 cb_click_type;
     int                 last_line;
-    int                 last_click_time;
+    uint64_t            last_click_time;
 
     int  mouse_down_handler( int local_x, int local_y ) override;
     int  mouse_up_handler( int local_x, int local_y, bool inside ) override;