2 files changed, 4 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index 32480ee..69a6ff9 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+- net_monitor:
+  o make expose_event callback more robust (#36537)
+
 0.25:
 - draksambashare (aginies):
   o fix typo, fix inherit permission problem, re-order some share options
diff --git a/bin/net_monitor b/bin/net_monitor
index a93fea2..659df33 100755
--- a/bin/net_monitor
+++ b/bin/net_monitor
@@ -432,6 +432,7 @@ sub update() {
                                     gtkset($measure_t, text => formatXiB($transmitted));
                                 });
 	    $darea->{$intf}->signal_connect(expose_event => sub {
+                         return if !$darea->{$intf}->window;
                          $darea->{$intf}->window->draw_drawable($darea->{$intf}->style->bg_gc('normal'), $pixmap->{$intf}, 0, 0, 0, 0, $width, $height);
                      });
             $gc_lines->{$intf} = Gtk2::Gdk::GC->new($darea->{$intf}->window);