diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-06-07 22:55:18 -0500 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2012-06-09 02:44:25 +0200 |
| commit | 1dcd235e7edf389632143236db9a69191f31308a (patch) | |
| tree | 5f2f853605ea825d0f2db37fe45a8e82ddf7fb39 | |
| parent | a13e78ad711f858ca92b64c4ef9a72631153fa4a (diff) | |
| download | tdebase-1dcd235e7edf389632143236db9a69191f31308a.tar.gz tdebase-1dcd235e7edf389632143236db9a69191f31308a.zip | |
Fix kdesktop_lock crash on mouse events when no dialog is displayed
This closes Bug 1008
(cherry picked from commit 09dbd438c1fd7f3ee00eae33459bb7077fc3f9c2)
| -rw-r--r-- | kdesktop/lock/lockprocess.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kdesktop/lock/lockprocess.cc b/kdesktop/lock/lockprocess.cc index 0b9285382..6cf771014 100644 --- a/kdesktop/lock/lockprocess.cc +++ b/kdesktop/lock/lockprocess.cc @@ -2391,7 +2391,7 @@ void LockProcess::slotMouseActivity(XEvent *event) bool inDialog = 0; XButtonEvent *be = (XButtonEvent *) event; XMotionEvent *me = (XMotionEvent *) event; - if (event->type == ButtonPress) { + if ((event->type == ButtonPress) && (mDialogs.first())) { // Get geometry including window frame/titlebar TQRect fgeom = mDialogs.first()->frameGeometry(); TQRect wgeom = mDialogs.first()->geometry(); @@ -2432,7 +2432,7 @@ void LockProcess::slotMouseActivity(XEvent *event) int deltaY = me->y_root - m_mousePrevY; m_dialogPrevX = m_dialogPrevX + deltaX; m_dialogPrevY = m_dialogPrevY + deltaY; - mDialogs.first()->move(m_dialogPrevX, m_dialogPrevY); + if (mDialogs.first()) mDialogs.first()->move(m_dialogPrevX, m_dialogPrevY); m_mousePrevX = me->x_root; m_mousePrevY = me->y_root; |