From 4c9d9e17d60d498b6f1f6526ed7372aeef8b1a41 Mon Sep 17 00:00:00 2001
From: "Peter F. Patel-Schneider" <pfpschneider@gmail.com>
Date: Sat, 20 Nov 2021 20:11:44 -0500
Subject: [PATCH] gui: fix bug when adding new receiver to tray menu

---
 lib/solaar/ui/tray.py   | 2 +-
 lib/solaar/ui/window.py | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/solaar/ui/tray.py b/lib/solaar/ui/tray.py
index 1fdc9069..68f6b86c 100644
--- a/lib/solaar/ui/tray.py
+++ b/lib/solaar/ui/tray.py
@@ -409,7 +409,7 @@ def _add_receiver(receiver):
 
     new_receiver_info = (receiver.path, None, receiver.name, None)
     assert len(new_receiver_info) == len(_RECEIVER_SEPARATOR)
-    _devices_info.append(new_receiver_info)
+    _devices_info.insert(0, new_receiver_info)
 
     new_menu_item = Gtk.ImageMenuItem.new_with_label(receiver.name)
     icon_set = _icons.device_icon_set(receiver.name)
diff --git a/lib/solaar/ui/window.py b/lib/solaar/ui/window.py
index ef6cb76d..cc20f9c8 100644
--- a/lib/solaar/ui/window.py
+++ b/lib/solaar/ui/window.py
@@ -879,7 +879,8 @@ def update(device, need_popup=False, refresh=False):
         elif item:
             if _TREE_SEPATATOR:
                 separator = _model.iter_next(item)
-                _model.remove(separator)
+                if separator:
+                    _model.remove(separator)
             _model.remove(item)
 
     else: