summaryrefslogtreecommitdiffstats
path: root/vncviewer/Viewport.cxx
diff options
context:
space:
mode:
authorPeter Åstrand <astrand@cendio.se>2011-06-23 08:40:14 +0000
committerPeter Åstrand <astrand@cendio.se>2011-06-23 08:40:14 +0000
commit086359c417c646fa5ab070cc50455ba7ff8f7c46 (patch)
tree2b860daa5f14c59dd53a922558b4b40f9a219a68 /vncviewer/Viewport.cxx
parent8e63168acbf3e6584a0682e4e90396d3de925283 (diff)
downloadtigervnc-086359c417c646fa5ab070cc50455ba7ff8f7c46.tar.gz
tigervnc-086359c417c646fa5ab070cc50455ba7ff8f7c46.zip
Call setMenuKey before initContextMenu to avoid uninitialised
menuKeyCode. git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4520 3789f03b-4d11-0410-bbf8-ca57d06f2519
Diffstat (limited to 'vncviewer/Viewport.cxx')
-rw-r--r--vncviewer/Viewport.cxx3
1 files changed, 1 insertions, 2 deletions
diff --git a/vncviewer/Viewport.cxx b/vncviewer/Viewport.cxx
index ae9aa106..8d57e9bd 100644
--- a/vncviewer/Viewport.cxx
+++ b/vncviewer/Viewport.cxx
@@ -89,9 +89,8 @@ Viewport::Viewport(int w, int h, const rfb::PixelFormat& serverPF, CConn* cc_)
// reparenting to the current window works for most cases.
window()->add(contextMenu);
- initContextMenu();
-
setMenuKey();
+ initContextMenu();
OptionsDialog::addCallback(handleOptions, this);
}