← Back to branch summary

~brandontschaefer/unity/allow-outof-bounds-dragging-overlay-scrollbar

« back to all changes in this revision

Viewing changes to plugins/unityshell/src/unityshell.cpp

  • Committer: Tarmac
  • Author(s): Andrea Azzarone
  • Date: 2013-01-14 12:06:45 UTC
  • mfrom: (3030.1.3 fix-1087422)
  • Revision ID: tarmac-20130114120645-x92bb9l8mypuij4v
Fix a race condition with windows that start minimized. Fixes: https://bugs.launchpad.net/bugs/1087422, https://bugs.launchpad.net/bugs/1089981.

Approved by Łukasz Zemczak, Marco Trevisan (Treviño).

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/unityshell/src/unityshell.cpp
2668
2668
    /* Fall through an re-evaluate wraps on map and unmap too */
2669
2669
    case CompWindowNotifyUnmap:
2670
2670
      if (UnityScreen::get (screen)->optionGetShowMinimizedWindows () &&
2671
 
          window->mapNum ())
 
2671
          window->mapNum () &&
 
2672
          !window->pendingUnmaps())
2672
2673
      {
2673
2674
        bool wasMinimized = window->minimized ();
2674
2675
        if (wasMinimized)