diff options
| author | dec05eba <dec05eba@protonmail.com> | 2020-09-24 02:01:54 +0200 |
|---|---|---|
| committer | dec05eba <dec05eba@protonmail.com> | 2020-09-24 02:06:43 +0200 |
| commit | fe6db40c2f6cd10b4af086d622cf59442b7e7c67 (patch) | |
| tree | 71b73ef9ce282fa267024144739f596203baf3ce /src/QuickMedia.cpp | |
| parent | e5d323cb063cd5762a6945439028c1ee7756aa45 (diff) | |
Fix segfault on file manager exit, unload thumbnails on tab switch
Diffstat (limited to 'src/QuickMedia.cpp')
| -rw-r--r-- | src/QuickMedia.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/QuickMedia.cpp b/src/QuickMedia.cpp index 09c6e01..5d8a7e4 100644 --- a/src/QuickMedia.cpp +++ b/src/QuickMedia.cpp @@ -252,7 +252,7 @@ namespace QuickMedia { delete body; if(file_manager) delete file_manager; - if(current_plugin) + if(current_plugin && current_plugin != file_manager) delete current_plugin; if(disp) XCloseDisplay(disp); @@ -1097,6 +1097,7 @@ namespace QuickMedia { if(tabs[selected_tab].body) { tabs[selected_tab].body->filter_search_fuzzy(""); tabs[selected_tab].body->clamp_selection(); + tabs[selected_tab].body->clear_thumbnails(); } selected_tab = std::max(0, selected_tab - 1); search_bar->clear(); @@ -1104,6 +1105,7 @@ namespace QuickMedia { if(tabs[selected_tab].body) { tabs[selected_tab].body->filter_search_fuzzy(""); tabs[selected_tab].body->clamp_selection(); + tabs[selected_tab].body->clear_thumbnails(); } selected_tab = std::min((int)tabs.size() - 1, selected_tab + 1); search_bar->clear(); @@ -1869,11 +1871,13 @@ namespace QuickMedia { } else if(event.key.code == sf::Keyboard::Left) { tabs[selected_tab].body->filter_search_fuzzy(""); tabs[selected_tab].body->clamp_selection(); + tabs[selected_tab].body->clear_thumbnails(); selected_tab = std::max(0, selected_tab - 1); search_bar->clear(); } else if(event.key.code == sf::Keyboard::Right) { tabs[selected_tab].body->filter_search_fuzzy(""); tabs[selected_tab].body->clamp_selection(); + tabs[selected_tab].body->clear_thumbnails(); selected_tab = std::min((int)tabs.size() - 1, selected_tab + 1); search_bar->clear(); } @@ -2579,7 +2583,7 @@ namespace QuickMedia { search_bar->text_autosearch_delay = prev_autosearch_delay; // We want exit code 1 if the file manager was launched and no files were selected, to know when the user didn't select any file(s) if(selected_files.empty() && current_page == Page::EXIT) - exit(1); + exit_code = 1; } void Program::image_board_thread_list_page() { @@ -3333,11 +3337,13 @@ namespace QuickMedia { } else if(event.key.code == sf::Keyboard::Left) { tabs[selected_tab].body->filter_search_fuzzy(""); tabs[selected_tab].body->clamp_selection(); + tabs[selected_tab].body->clear_thumbnails(); selected_tab = std::max(0, selected_tab - 1); chat_input.clear(); } else if(event.key.code == sf::Keyboard::Right) { tabs[selected_tab].body->filter_search_fuzzy(""); tabs[selected_tab].body->clamp_selection(); + tabs[selected_tab].body->clear_thumbnails(); selected_tab = std::min((int)tabs.size() - 1, selected_tab + 1); chat_input.clear(); } |