summaryrefslogtreecommitdiff
path: root/scene/gui
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2016-06-04 21:45:50 -0300
committerJuan Linietsky <reduzio@gmail.com>2016-06-04 21:45:50 -0300
commitc1028b9011693f9e40f32bfcd45f33b1efedce9a (patch)
treecfaa0e9678ee7e5ba15bb92eb495e01a06efa3d4 /scene/gui
parent007efb6a20dcaa9230f1cfdc1cda92db24c5510f (diff)
fix for travis
Diffstat (limited to 'scene/gui')
-rw-r--r--scene/gui/popup_menu.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/gui/popup_menu.cpp b/scene/gui/popup_menu.cpp
index 4c69584f4a..b3f18bf8fa 100644
--- a/scene/gui/popup_menu.cpp
+++ b/scene/gui/popup_menu.cpp
@@ -771,7 +771,7 @@ String PopupMenu::get_item_tooltip(int p_idx) const {
Ref<ShortCut> PopupMenu::get_item_shortcut(int p_idx) const {
- ERR_FAIL_INDEX_V(p_idx,items.size(),"");
+ ERR_FAIL_INDEX_V(p_idx,items.size(),Ref<ShortCut>());
return items[p_idx].shortcut;
}