diff options
| author | Darrell Anderson <humanreadable@yahoo.com> | 2012-06-08 15:46:24 -0500 |
|---|---|---|
| committer | Darrell Anderson <humanreadable@yahoo.com> | 2012-06-08 15:46:24 -0500 |
| commit | 3e7ffad7420d3a843094e07cecc7e201e78b4822 (patch) | |
| tree | 1494423561c0a855aa69c82aa031116c06785f6a | |
| parent | 94f3dbe7c5a7dc282c22d347d91e4851cabe77d8 (diff) | |
| parent | 09dbd438c1fd7f3ee00eae33459bb7077fc3f9c2 (diff) | |
| download | tdebase-3e7ffad7420d3a843094e07cecc7e201e78b4822.tar.gz tdebase-3e7ffad7420d3a843094e07cecc7e201e78b4822.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdebase
| -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 a18f16dae..2ce750756 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; |