Merge pull request #2732 from cmaughan/hotfixes/sample_path

Fix lookup of samples

Author: samaaron

app/gui/qt/mainwindow.cpp

@@ -165,7 +165,7 @@ MainWindow::MainWindow(QApplication& app, bool i18n, QSplashScreen* splash)
     initDocsWindow();
 
     //setup autocompletion
-    autocomplete->loadSamples(sample_path);
+    autocomplete->loadSamples(QString::fromStdString(m_spAPI->GetPath(SonicPiPath::SamplePath)));
 
     QThreadPool::globalInstance()->setMaxThreadCount(3);
 
@@ -248,8 +248,8 @@ void MainWindow::checkForStudioMode()
     std::cout << "[GUI] - Fetching Studio hashes" << std::endl;
     QProcess* fetchStudioHashes = new QProcess();
     QStringList fetch_studio_hashes_send_args;
-    fetch_studio_hashes_send_args << fetch_url_path << "http://sonic-pi.net/static/info/studio-hashes.txt";
-    fetchStudioHashes->start(ruby_path, fetch_studio_hashes_send_args);
+    fetch_studio_hashes_send_args << QString::fromStdString(m_spAPI->GetPath(SonicPiPath::FetchUrlPath)) << "http://sonic-pi.net/static/info/studio-hashes.txt";
+    fetchStudioHashes->start(QString::fromStdString(m_spAPI->GetPath(SonicPiPath::RubyPath)), fetch_studio_hashes_send_args);
     fetchStudioHashes->waitForFinished();
     QTextStream stream(fetchStudioHashes->readAllStandardOutput().trimmed());
     QString line = stream.readLine();

app/gui/qt/mainwindow.h

@@ -400,7 +400,11 @@ class MainWindow : public QMainWindow
         std::ofstream stdlog;
 
         ScintillaAPI *autocomplete;
-        QString fetch_url_path, sample_path, log_path, sp_user_path, sp_user_tmp_path, ruby_server_path, ruby_path, server_error_log_path, server_output_log_path, gui_log_path, scsynth_log_path, init_script_path, exit_script_path, tmp_file_store, process_log_path, port_discovery_path, qt_app_theme_path, qt_browser_dark_css, qt_browser_light_css, qt_browser_hc_css;
+#ifdef QT_OLD_API
+        QString fetch_url_path, sample_path, log_path, sp_user_path, sp_user_tmp_path, ruby_server_path, ruby_path, server_error_log_path, server_output_log_path, gui_log_path, scsynth_log_path, init_script_path, exit_script_path, tmp_file_store, process_log_path, port_discovery_path;
+#endif
+        QString qt_browser_dark_css, qt_browser_light_css, qt_browser_hc_css, qt_app_theme_path;
+
         QString defaultTextBrowserStyle;
 
         QString version;