Changeset 34936 in vbox for trunk/src/VBox

Timestamp:

Dec 10, 2010 7:57:23 AM (14 years ago)

Author:

vboxsync

Message:

FE/Qt: Fixed some crash in keyboard handler.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime

Files:

• UIKeyboardHandler.cpp (modified) (1 diff)
• UIMachineLogic.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIKeyboardHandler.cpp

@@ -837 +837 @@
 LRESULT CALLBACK UIKeyboardHandler::lowLevelKeyboardProc(int nCode, WPARAM wParam, LPARAM lParam)
 {
-    if (nCode == HC_ACTION && m_pKeyboardHandler->winLowKeyboardEvent(wParam, *(KBDLLHOOKSTRUCT*)lParam))
+    if (nCode == HC_ACTION && m_pKeyboardHandler && m_pKeyboardHandler->winLowKeyboardEvent(wParam, *(KBDLLHOOKSTRUCT*)lParam))
         return 1;
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp

@@ -343 +343 @@
     , m_pActionsPool(pActionsPool)
     , m_visualStateType(visualStateType)
+    , m_pKeyboardHandler(0)
     , m_pMouseHandler(0)
     , m_pRunningActions(0)