Merge lp:~3v1n0/unity/input-monitor-dtor-fixes into lp:unity

[Marco Trevisan (Treviño)]

InputMonitor: don't try to deference an invalid Nux display

[Andrea Azzarone (azzar1)]

+1

=== modified file 'unity-shared/InputMonitor.cpp'
--- unity-shared/InputMonitor.cpp	2016-09-06 17:37:50 +0000
+++ unity-shared/InputMonitor.cpp	2017-02-28 17:29:16 +0000
@@ -225,7 +225,8 @@
 
   void UpdateEventMonitor()
   {
-    auto* dpy = nux::GetGraphicsDisplay()->GetX11Display();
+    auto* nux_dpy = nux::GetGraphicsDisplay();
+    auto* dpy = nux_dpy ? nux_dpy->GetX11Display() : gdk_x11_get_default_xdisplay();
     Window root = DefaultRootWindow(dpy);
 
     unsigned char master_dev_bits[XIMaskLen(XI_LASTEVENT)] = { 0 };
@@ -263,9 +264,9 @@
 
     if (!pointer_callbacks_.empty() || !key_callbacks_.empty() || !barrier_callbacks_.empty())
     {
-      if (!event_filter_set_)
+      if (!event_filter_set_ && nux_dpy)
       {
-        nux::GetGraphicsDisplay()->AddEventFilter({[] (XEvent event, void* data) {
+        nux_dpy->AddEventFilter({[] (XEvent event, void* data) {
           return static_cast<Impl*>(data)->HandleEvent(event);
         }, this});
 
@@ -275,7 +276,9 @@
     }
     else if (event_filter_set_)
     {
-      nux::GetGraphicsDisplay()->RemoveEventFilter(this);
+      if (nux_dpy)
+        nux_dpy->RemoveEventFilter(this);
+
       event_filter_set_ = false;
       LOG_DEBUG(logger) << "Event filter disabled";
     }

=== modified file 'unity-shared/MenuManager.cpp'
--- unity-shared/MenuManager.cpp	2016-09-06 17:37:50 +0000
+++ unity-shared/MenuManager.cpp	2017-02-28 17:29:16 +0000
@@ -325,17 +325,12 @@
 
   bool RegisterTracker(std::string const& menubar, PositionTracker const& cb)
   {
-    auto it = position_trackers_.find(menubar);
-
-    if (it != end(position_trackers_))
-      return false;
-
-    position_trackers_.insert({menubar, cb});
-
-    if (active_menubar_ == menubar)
+    bool added = position_trackers_.insert({menubar, cb}).second;
+
+    if (added && active_menubar_ == menubar)
       UpdateActiveTracker();
 
-    return true;
+    return added;
   }
 
   bool UnregisterTracker(std::string const& menubar, PositionTracker const& cb)