CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'fix_tests' of https://github.com/02JanDal/MultiMC5 into develop

Browse Source
This commit is contained in:
Petr Mrázek
2014-01-18 22:30:36 +01:00
parent e9186d6d2c 7d76fd57e9
commit 50c441a773
9 changed files with 52 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
logic/updater/UpdateChecker.cpp
View File

@ -30,7 +30,6 @@
UpdateChecker::UpdateChecker()
{
m_currentChannel = VERSION_CHANNEL;
m_channelListUrl = CHANLIST_URL;
m_updateChecking = false;
m_chanListLoading = false;

2
logic/updater/UpdateChecker.h
View File

@ -27,7 +27,6 @@ public:
UpdateChecker();
void checkForUpdate(bool notifyNoUpdate);
void setCurrentChannel(const QString &channel) { m_currentChannel = channel; }
void setChannelListUrl(const QString &url) { m_channelListUrl = url; }
/*!
@ -83,7 +82,6 @@ private:
QString m_repoUrl;
QString m_channelListUrl;
QString m_currentChannel;
QList<ChannelListEntry> m_channels;