Fix lbry launch icon not loading, incorrect tabs body items cleared on tab switch

1 files changed, 5 insertions, 3 deletions

diff --git a/src/Tabs.cpp b/src/Tabs.cpp
index 866589b..059a8d8 100644
--- a/src/Tabs.cpp
+++ b/src/Tabs.cpp
@@ -37,7 +37,8 @@ namespace QuickMedia {
     }
 
     void Tabs::move_selected_tab(int new_tab) {
-        const int tab_diff = new_tab - selected_tab;
+        const int prev_tab = selected_tab;
+        const int tab_diff = new_tab - prev_tab;
 
         if(tab_diff > 0) {
             while(selected_tab < new_tab) {
@@ -58,7 +59,7 @@ namespace QuickMedia {
         }
 
         if(on_change_tab)
-            on_change_tab(selected_tab);
+            on_change_tab(prev_tab, selected_tab);
     }
 
     void Tabs::on_event(sf::Event &event) {
@@ -221,7 +222,8 @@ namespace QuickMedia {
     }
 
     void Tabs::set_selected(int index) {
-        move_selected_tab(index);
+        if(index >= 0 && index < (int)tabs.size())
+            move_selected_tab(index);
     }
 
     int Tabs::get_selected() const {