github/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent synced 2025-08-21 05:43:32 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix segfault on Linux due to early initialization of global var.

Browse source 
misc::pythonVersion() gets called before the Logger is initialized.

Conflicts:
	src/searchengine/engineselectdlg.cpp
This commit is contained in:
sledgehammer999 2015-07-21 22:39:17 +03:00
commit 14d590b3be
2 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/searchengine/engineselectdlg.cpp
View file

@ -47,9 +47,12 @@
#include <QMimeData> #include <QMimeData>
enum EngineColumns {ENGINE_NAME, ENGINE_VERSION, ENGINE_URL, ENGINE_STATE, ENGINE_ID}; enum EngineColumns {ENGINE_NAME, ENGINE_VERSION, ENGINE_URL, ENGINE_STATE, ENGINE_ID};
const QString UPDATE_URL = QString("https://raw.github.com/qbittorrent/qBittorrent/master/src/searchengine/") + (misc::pythonVersion() >= 3 ? "nova3" : "nova") + "/engines/";
engineSelectDlg::engineSelectDlg(QWidget *parent, SupportedEngines *supported_engines) : QDialog(parent), supported_engines(supported_engines) { engineSelectDlg::engineSelectDlg(QWidget *parent, SupportedEngines *supported_engines)
: QDialog(parent)
, supported_engines(supported_engines)
, m_updateUrl(QString("https://raw.github.com/qbittorrent/qBittorrent/master/src/searchengine/") + (misc::pythonVersion() >= 3 ? "nova3" : "nova") + "/engines/")
{
setupUi(this); setupUi(this);
setAttribute(Qt::WA_DeleteOnClose); setAttribute(Qt::WA_DeleteOnClose);
pluginsTree->setRootIsDecorated(false); pluginsTree->setRootIsDecorated(false);
@ -111,7 +114,7 @@ void engineSelectDlg::dragEnterEvent(QDragEnterEvent *event) {
void engineSelectDlg::on_updateButton_clicked() { void engineSelectDlg::on_updateButton_clicked() {
// Download version file from update server on sourceforge // Download version file from update server on sourceforge
setCursor(QCursor(Qt::WaitCursor)); setCursor(QCursor(Qt::WaitCursor));
downloader->downloadUrl(QString(UPDATE_URL)+"versions.txt"); downloader->downloadUrl(m_updateUrl + "versions.txt");
} }
void engineSelectDlg::toggleEngineState(QTreeWidgetItem *item, int) { void engineSelectDlg::toggleEngineState(QTreeWidgetItem *item, int) {
@ -398,8 +401,8 @@ bool engineSelectDlg::parseVersionsFile(QString versions_file) {
qDebug("Plugin: %s is outdated", qPrintable(plugin_name)); qDebug("Plugin: %s is outdated", qPrintable(plugin_name));
// Downloading update // Downloading update
setCursor(QCursor(Qt::WaitCursor)); setCursor(QCursor(Qt::WaitCursor));
downloader->downloadUrl(UPDATE_URL+plugin_name+".py"); downloader->downloadUrl(m_updateUrl + plugin_name + ".py");
//downloader->downloadUrl(UPDATE_URL+plugin_name+".png"); //downloader->downloadUrl(m_updateUrl + plugin_name + ".png");
updated = true; updated = true;
}else { }else {
qDebug("Plugin: %s is up to date", qPrintable(plugin_name)); qDebug("Plugin: %s is up to date", qPrintable(plugin_name));

1
src/searchengine/engineselectdlg.h
View file

@ -46,6 +46,7 @@ class engineSelectDlg : public QDialog, public Ui::engineSelect{
private: private:
DownloadThread *downloader; DownloadThread *downloader;
SupportedEngines *supported_engines; SupportedEngines *supported_engines;
const QString m_updateUrl;
public: public:
engineSelectDlg(QWidget *parent, SupportedEngines *supported_engines); engineSelectDlg(QWidget *parent, SupportedEngines *supported_engines);