Merge pull request #1000 from Al12rs/startup_performance

Startup performance

1 files changed, 13 insertions, 0 deletions

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index de1be9fe..8f2dd250 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -1659,6 +1659,15 @@ void MainWindow::on_profileBox_currentIndexChanged(int index)
       m_OrganizerCore.saveCurrentLists();
     }
 
+    // Avoid doing any refresh if currentProfile is already set but previous index was -1
+    // as it means that this is happening during initialization so everything has already been set.
+    if (previousIndex == -1 
+        && m_OrganizerCore.currentProfile() != nullptr 
+        && m_OrganizerCore.currentProfile()->exists() 
+        && ui->profileBox->currentText() == m_OrganizerCore.currentProfile()->name()){
+      return;
+    }
+
     // ensure the new index is valid
     if (index < 0 || index >= ui->profileBox->count()) {
       log::debug("invalid profile index, using last profile");
@@ -5282,6 +5291,10 @@ void MainWindow::initDownloadView()
 
 void MainWindow::updateDownloadView()
 {
+  // this means downlaodTab initialization hasnt happened yet
+  if (ui->downloadView->model() == nullptr) {
+    return;
+  }
   // set the view attribute and default row sizes
   if (m_OrganizerCore.settings().interface().compactDownloads()) {
     ui->downloadView->setProperty("downloadView", "compact");