0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix MMC-15

Browse Source 
``mod does not delete from jar''
This commit is contained in:
Petr Mrázek 2013-10-09 23:16:10 +02:00
parent 595943244c
commit eaf0cbeafc
4 changed files with 183 additions and 194 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gui/mainwindow.cpp
View File

@ -507,10 +507,11 @@ void MainWindow::onLoginComplete()
}
else
{
ProgressDialog *tDialog = new ProgressDialog(this);
ProgressDialog tDialog(this);
connect(updateTask, SIGNAL(succeeded()), SLOT(onGameUpdateComplete()));
connect(updateTask, SIGNAL(failed(QString)), SLOT(onGameUpdateError(QString)));
tDialog->exec(updateTask);
tDialog.exec(updateTask);
delete updateTask;
}
}

125
logic/LegacyInstance.cpp
View File

@ -14,8 +14,9 @@
#define LAUNCHER_FILE "MultiMCLauncher.jar"
LegacyInstance::LegacyInstance(const QString& rootDir, SettingsObject* settings, QObject* parent)
:BaseInstance( new LegacyInstancePrivate(),rootDir, settings, parent)
LegacyInstance::LegacyInstance(const QString &rootDir, SettingsObject *settings,
QObject *parent)
: BaseInstance(new LegacyInstancePrivate(), rootDir, settings, parent)
{
settings->registerSetting(new Setting("NeedsRebuild", true));
settings->registerSetting(new Setting("ShouldUpdate", false));
@ -24,50 +25,51 @@ LegacyInstance::LegacyInstance(const QString& rootDir, SettingsObject* settings,
settings->registerSetting(new Setting("IntendedJarVersion", ""));
}
BaseUpdate* LegacyInstance::doUpdate()
BaseUpdate *LegacyInstance::doUpdate()
{
auto list = jarModList();
return new LegacyUpdate(this, this);
}
MinecraftProcess* LegacyInstance::prepareForLaunch(LoginResponse response)
MinecraftProcess *LegacyInstance::prepareForLaunch(LoginResponse response)
{
MinecraftProcess * proc = new MinecraftProcess(this);
MinecraftProcess *proc = new MinecraftProcess(this);
QIcon icon = MMC->icons()->getIcon(iconKey());
auto pixmap = icon.pixmap(128,128);
pixmap.save(PathCombine(minecraftRoot(), "icon.png"),"PNG");
auto pixmap = icon.pixmap(128, 128);
pixmap.save(PathCombine(minecraftRoot(), "icon.png"), "PNG");
// extract the legacy launcher
QFile(":/launcher/launcher.jar").copy(PathCombine(minecraftRoot(), LAUNCHER_FILE));
// set the process arguments
{
QStringList args;
// window size
QString windowSize;
if (settings().get("LaunchMaximized").toBool())
windowSize = "max";
else
windowSize = QString("%1x%2").
arg(settings().get("MinecraftWinWidth").toInt()).
arg(settings().get("MinecraftWinHeight").toInt());
windowSize = QString("%1x%2").arg(settings().get("MinecraftWinWidth").toInt()).arg(
settings().get("MinecraftWinHeight").toInt());
// window title
QString windowTitle;
windowTitle.append("MultiMC: ").append(name());
// Java arguments
args.append(Util::Commandline::splitArgs(settings().get("JvmArgs").toString()));
#ifdef OSX
// OSX dock icon and name
args << "-Xdock:icon=icon.png";
args << QString("-Xdock:name=\"%1\"").arg(windowTitle);
#endif
QString lwjgl = QDir(MMC->settings()->get("LWJGLDir").toString() + "/" + lwjglVersion()).absolutePath();
QString lwjgl = QDir(MMC->settings()->get("LWJGLDir").toString() + "/" + lwjglVersion())
.absolutePath();
// launcher arguments
args << QString("-Xms%1m").arg(settings().get("MinMemAlloc").toInt());
args << QString("-Xmx%1m").arg(settings().get("MaxMemAlloc").toInt());
@ -80,41 +82,39 @@ MinecraftProcess* LegacyInstance::prepareForLaunch(LoginResponse response)
args << lwjgl;
proc->setMinecraftArguments(args);
}
// set the process work path
proc->setMinecraftWorkdir(minecraftRoot());
return proc;
}
void LegacyInstance::cleanupAfterRun()
{
//FIXME: delete the launcher and icons and whatnot.
// FIXME: delete the launcher and icons and whatnot.
}
std::shared_ptr< ModList > LegacyInstance::coreModList()
std::shared_ptr<ModList> LegacyInstance::coreModList()
{
I_D(LegacyInstance);
if(!d->core_mod_list)
if (!d->core_mod_list)
{
d->core_mod_list.reset(new ModList(coreModsDir()));
}
else
d->core_mod_list->update();
d->core_mod_list->update();
return d->core_mod_list;
}
std::shared_ptr< ModList > LegacyInstance::jarModList()
std::shared_ptr<ModList> LegacyInstance::jarModList()
{
I_D(LegacyInstance);
if(!d->jar_mod_list)
if (!d->jar_mod_list)
{
auto list = new ModList(jarModsDir(), modListFile());
connect(list, SIGNAL(changed()), SLOT(jarModsChanged()));
d->jar_mod_list.reset(list);
}
else
d->jar_mod_list->update();
d->jar_mod_list->update();
return d->jar_mod_list;
}
@ -123,38 +123,33 @@ void LegacyInstance::jarModsChanged()
setShouldRebuild(true);
}
std::shared_ptr< ModList > LegacyInstance::loaderModList()
std::shared_ptr<ModList> LegacyInstance::loaderModList()
{
I_D(LegacyInstance);
if(!d->loader_mod_list)
if (!d->loader_mod_list)
{
d->loader_mod_list.reset(new ModList(loaderModsDir()));
}
else
d->loader_mod_list->update();
d->loader_mod_list->update();
return d->loader_mod_list;
}
std::shared_ptr< ModList > LegacyInstance::texturePackList()
std::shared_ptr<ModList> LegacyInstance::texturePackList()
{
I_D(LegacyInstance);
if(!d->texture_pack_list)
if (!d->texture_pack_list)
{
d->texture_pack_list.reset(new ModList(texturePacksDir()));
}
else
d->texture_pack_list->update();
d->texture_pack_list->update();
return d->texture_pack_list;
}
QDialog * LegacyInstance::createModEditDialog ( QWidget* parent )
QDialog *LegacyInstance::createModEditDialog(QWidget *parent)
{
return new LegacyModEditDialog(this, parent);
}
QString LegacyInstance::jarModsDir() const
{
return PathCombine(instanceRoot(), "instMods");
@ -204,7 +199,6 @@ QString LegacyInstance::instanceConfigFolder() const
return PathCombine(minecraftRoot(), "config");
}
/*
bool LegacyInstance::shouldUpdateCurrentVersion() const
{
@ -215,21 +209,22 @@ bool LegacyInstance::shouldUpdateCurrentVersion() const
void LegacyInstance::updateCurrentVersion(bool keepCurrent)
{
QFileInfo jar(runnableJar());
if(!jar.exists())
{
setLastCurrentVersionUpdate(0);
setCurrentVersionId("Unknown");
return;
}
qint64 time = jar.lastModified().toUTC().toMSecsSinceEpoch();
setLastCurrentVersionUpdate(time);
if (!keepCurrent)
{
// TODO: Implement GetMinecraftJarVersion function.
QString newVersion = "Unknown";//javautils::GetMinecraftJarVersion(jar.absoluteFilePath());
QString newVersion =
"Unknown";//javautils::GetMinecraftJarVersion(jar.absoluteFilePath());
setCurrentVersionId(newVersion);
}
}
@ -247,41 +242,41 @@ void LegacyInstance::setLastCurrentVersionUpdate ( qint64 val )
bool LegacyInstance::shouldRebuild() const
{
I_D(LegacyInstance);
return d->m_settings->get ( "NeedsRebuild" ).toBool();
return d->m_settings->get("NeedsRebuild").toBool();
}
void LegacyInstance::setShouldRebuild ( bool val )
void LegacyInstance::setShouldRebuild(bool val)
{
I_D(LegacyInstance);
d->m_settings->set ( "NeedsRebuild", val );
d->m_settings->set("NeedsRebuild", val);
}
QString LegacyInstance::currentVersionId() const
{
I_D(LegacyInstance);
return d->m_settings->get ( "JarVersion" ).toString();
return d->m_settings->get("JarVersion").toString();
}
void LegacyInstance::setCurrentVersionId ( QString val )
void LegacyInstance::setCurrentVersionId(QString val)
{
I_D(LegacyInstance);
d->m_settings->set ( "JarVersion", val );
d->m_settings->set("JarVersion", val);
}
QString LegacyInstance::lwjglVersion() const
{
I_D(LegacyInstance);
return d->m_settings->get ( "LwjglVersion" ).toString();
return d->m_settings->get("LwjglVersion").toString();
}
void LegacyInstance::setLWJGLVersion ( QString val )
void LegacyInstance::setLWJGLVersion(QString val)
{
I_D(LegacyInstance);
d->m_settings->set ( "LwjglVersion", val );
d->m_settings->set("LwjglVersion", val);
}
QString LegacyInstance::intendedVersionId() const
{
I_D(LegacyInstance);
return d->m_settings->get ( "IntendedJarVersion" ).toString();
return d->m_settings->get("IntendedJarVersion").toString();
}
bool LegacyInstance::setIntendedVersionId ( QString version )
bool LegacyInstance::setIntendedVersionId(QString version)
{
settings().set("IntendedJarVersion", version);
setShouldUpdate(true);
@ -290,16 +285,16 @@ bool LegacyInstance::setIntendedVersionId ( QString version )
bool LegacyInstance::shouldUpdate() const
{
I_D(LegacyInstance);
QVariant var = settings().get ( "ShouldUpdate" );
if ( !var.isValid() || var.toBool() == false )
QVariant var = settings().get("ShouldUpdate");
if (!var.isValid() || var.toBool() == false)
{
return intendedVersionId() != currentVersionId();
}
return true;
}
void LegacyInstance::setShouldUpdate ( bool val )
void LegacyInstance::setShouldUpdate(bool val)
{
settings().set ( "ShouldUpdate", val );
settings().set("ShouldUpdate", val);
}
QString LegacyInstance::defaultBaseJar() const
@ -312,7 +307,7 @@ QString LegacyInstance::defaultCustomBaseJar() const
return PathCombine(binDir(), "mcbackup.jar");
}
bool LegacyInstance::menuActionEnabled ( QString action_name ) const
bool LegacyInstance::menuActionEnabled(QString action_name) const
{
if (action_name == "actionChangeInstMCVersion")
return false;
@ -321,7 +316,7 @@ bool LegacyInstance::menuActionEnabled ( QString action_name ) const
QString LegacyInstance::getStatusbarDescription()
{
if(shouldUpdate())
if (shouldUpdate())
return "Legacy : " + currentVersionId() + " -> " + intendedVersionId();
else
return "Legacy : " + currentVersionId();

241
logic/ModList.cpp
View File

@ -1,12 +1,12 @@
//
//
// Copyright 2013 MultiMC Contributors
//
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
//
// http://www.apache.org/licenses/LICENSE-2.0
//
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@ -23,22 +23,23 @@
#include <QFileSystemWatcher>
#include <logger/QsLog.h>
ModList::ModList ( const QString& dir, const QString& list_file )
: QAbstractListModel(), m_dir(dir), m_list_file(list_file)
ModList::ModList(const QString &dir, const QString &list_file)
: QAbstractListModel(), m_dir(dir), m_list_file(list_file)
{
m_dir.setFilter(QDir::Readable | QDir::NoDotAndDotDot | QDir::Files | QDir::Dirs | QDir::NoSymLinks);
m_dir.setFilter(QDir::Readable | QDir::NoDotAndDotDot | QDir::Files | QDir::Dirs |
QDir::NoSymLinks);
m_dir.setSorting(QDir::Name);
m_list_id = QUuid::createUuid().toString();
m_watcher = new QFileSystemWatcher(this);
is_watching = false;
connect(m_watcher,SIGNAL(directoryChanged(QString)), this, SLOT(directoryChanged(QString)));
update();
connect(m_watcher, SIGNAL(directoryChanged(QString)), this,
SLOT(directoryChanged(QString)));
}
void ModList::startWatching()
{
is_watching = m_watcher->addPath(m_dir.absolutePath());
if(is_watching)
if (is_watching)
QLOG_INFO() << "Started watching " << m_dir.absolutePath();
else
QLOG_INFO() << "Failed to start watching " << m_dir.absolutePath();
@ -47,32 +48,31 @@ void ModList::startWatching()
void ModList::stopWatching()
{
is_watching = !m_watcher->removePath(m_dir.absolutePath());
if(!is_watching)
if (!is_watching)
QLOG_INFO() << "Stopped watching " << m_dir.absolutePath();
else
QLOG_INFO() << "Failed to stop watching " << m_dir.absolutePath();
}
bool ModList::update()
{
if (!isValid())
return false;
QList<Mod> newMods;
m_dir.refresh();
auto folderContents = m_dir.entryInfoList();
bool orderWasInvalid = false;
// first, process the ordered items (if any)
int currentOrderIndex = 0;
QStringList listOrder = readListFile();
for(auto item: listOrder)
for (auto item : listOrder)
{
QFileInfo info (m_dir.filePath(item));
QFileInfo info(m_dir.filePath(item));
int idx = folderContents.indexOf(info);
// if the file from the index file exists
if(idx != -1)
if (idx != -1)
{
// remove from the actual folder contents list
folderContents.takeAt(idx);
@ -84,26 +84,27 @@ bool ModList::update()
orderWasInvalid = true;
}
}
for(auto entry: folderContents)
for (auto entry : folderContents)
{
newMods.append(Mod(entry));
}
if(mods.size() != newMods.size())
if (mods.size() != newMods.size())
{
orderWasInvalid = true;
}
else for(int i = 0; i < mods.size(); i++)
{
if(!mods[i].strongCompare(newMods[i]))
else
for (int i = 0; i < mods.size(); i++)
{
orderWasInvalid = true;
break;
if (!mods[i].strongCompare(newMods[i]))
{
orderWasInvalid = true;
break;
}
}
}
beginResetModel();
mods.swap(newMods);
endResetModel();
if(orderWasInvalid)
if (orderWasInvalid)
{
saveListFile();
emit changed();
@ -111,22 +112,21 @@ bool ModList::update()
return true;
}
void ModList::directoryChanged ( QString path )
void ModList::directoryChanged(QString path)
{
update();
}
QStringList ModList::readListFile()
{
QStringList stringList;
if(m_list_file.isNull() || m_list_file.isEmpty())
if (m_list_file.isNull() || m_list_file.isEmpty())
return stringList;
QFile textFile(m_list_file);
if(!textFile.open(QIODevice::ReadOnly | QIODevice::Text))
if (!textFile.open(QIODevice::ReadOnly | QIODevice::Text))
return QStringList();
QTextStream textStream(&textFile);
while (true)
{
@ -144,13 +144,13 @@ QStringList ModList::readListFile()
bool ModList::saveListFile()
{
if(m_list_file.isNull() || m_list_file.isEmpty())
if (m_list_file.isNull() || m_list_file.isEmpty())
return false;
QFile textFile(m_list_file);
if(!textFile.open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Truncate))
if (!textFile.open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Truncate))
return false;
QTextStream textStream(&textFile);
for(auto mod:mods)
for (auto mod : mods)
{
auto pathname = mod.filename();
QString filename = pathname.fileName();
@ -160,29 +160,28 @@ bool ModList::saveListFile()
return false;
}
bool ModList::isValid()
{
return m_dir.exists() && m_dir.isReadable();
}
bool ModList::installMod ( const QFileInfo& filename, int index )
bool ModList::installMod(const QFileInfo &filename, int index)
{
if(!filename.exists() || !filename.isReadable() || index < 0)
if (!filename.exists() || !filename.isReadable() || index < 0)
{
return false;
}
Mod m(filename);
if(!m.valid())
if (!m.valid())
return false;
// if it's already there, replace the original mod (in place)
int idx = mods.indexOf(m);
if(idx != -1)
if (idx != -1)
{
if(mods[idx].replace(m))
if (mods[idx].replace(m))
{
auto left = this->index(index);
auto right = this->index(index, columnCount(QModelIndex()) - 1);
emit dataChanged(left, right);
@ -192,33 +191,33 @@ bool ModList::installMod ( const QFileInfo& filename, int index )
}
return false;
}
auto type = m.type();
if(type == Mod::MOD_UNKNOWN)
if (type == Mod::MOD_UNKNOWN)
return false;
if(type == Mod::MOD_SINGLEFILE || type == Mod::MOD_ZIPFILE)
if (type == Mod::MOD_SINGLEFILE || type == Mod::MOD_ZIPFILE)
{
QString newpath = PathCombine(m_dir.path(), filename.fileName());
if(!QFile::copy(filename.filePath(), newpath))
if (!QFile::copy(filename.filePath(), newpath))
return false;
m.repath(newpath);
beginInsertRows(QModelIndex(), index, index);
mods.insert(index,m);
mods.insert(index, m);
endInsertRows();
saveListFile();
emit changed();
return true;
}
else if(type == Mod::MOD_FOLDER)
else if (type == Mod::MOD_FOLDER)
{
QString from = filename.filePath();
QString to = PathCombine(m_dir.path(), filename.fileName());
if(!copyPath(from, to))
if (!copyPath(from, to))
return false;
m.repath(to);
beginInsertRows(QModelIndex(), index, index);
mods.insert(index,m);
mods.insert(index, m);
endInsertRows();
saveListFile();
emit changed();
@ -227,12 +226,12 @@ bool ModList::installMod ( const QFileInfo& filename, int index )
return false;
}
bool ModList::deleteMod ( int index )
bool ModList::deleteMod(int index)
{
if(index >= mods.size() || index < 0)
if (index >= mods.size() || index < 0)
return false;
Mod & m = mods[index];
if(m.destroy())
Mod &m = mods[index];
if (m.destroy())
{
beginRemoveRows(QModelIndex(), index, index);
mods.removeAt(index);
@ -244,11 +243,11 @@ bool ModList::deleteMod ( int index )
return false;
}
bool ModList::deleteMods ( int first, int last )
bool ModList::deleteMods(int first, int last)
{
for(int i = first; i <= last; i++)
for (int i = first; i <= last; i++)
{
Mod & m = mods[i];
Mod &m = mods[i];
m.destroy();
}
beginRemoveRows(QModelIndex(), first, last);
@ -259,18 +258,17 @@ bool ModList::deleteMods ( int first, int last )
return true;
}
bool ModList::moveModTo ( int from, int to )
bool ModList::moveModTo(int from, int to)
{
if(from < 0 || from >= mods.size())
if (from < 0 || from >= mods.size())
return false;
if (to >= rowCount())
to = rowCount() - 1;
if (to == -1)
to = rowCount() - 1;
if(from == to)
if (from == to)
return false;
int togap = to > from ? to + 1: to;
int togap = to > from ? to + 1 : to;
beginMoveRows(QModelIndex(), from, from, QModelIndex(), togap);
mods.move(from, to);
endMoveRows();
@ -279,83 +277,81 @@ bool ModList::moveModTo ( int from, int to )
return true;
}
bool ModList::moveModUp ( int from )
bool ModList::moveModUp(int from)
{
if(from > 0)
if (from > 0)
return moveModTo(from, from - 1);
return false;
}
bool ModList::moveModsUp ( int first, int last )
bool ModList::moveModsUp(int first, int last)
{
if(first == 0)
if (first == 0)
return false;
beginMoveRows(QModelIndex(), first, last, QModelIndex(), first - 1);
mods.move(first-1, last);
mods.move(first - 1, last);
endMoveRows();
saveListFile();
emit changed();
return true;
}
bool ModList::moveModDown ( int from )
bool ModList::moveModDown(int from)
{
if(from < 0)
if (from < 0)
return false;
if(from < mods.size() - 1)
if (from < mods.size() - 1)
return moveModTo(from, from + 1);
return false;
}
bool ModList::moveModsDown ( int first, int last )
bool ModList::moveModsDown(int first, int last)
{
if(last == mods.size() - 1)
if (last == mods.size() - 1)
return false;
beginMoveRows(QModelIndex(), first, last, QModelIndex(), last + 2);
mods.move(last+1, first);
mods.move(last + 1, first);
endMoveRows();
saveListFile();
emit changed();
return true;
}
int ModList::columnCount ( const QModelIndex& parent ) const
int ModList::columnCount(const QModelIndex &parent) const
{
return 2;
}
QVariant ModList::data ( const QModelIndex& index, int role ) const
QVariant ModList::data(const QModelIndex &index, int role) const
{
if(!index.isValid())
if (!index.isValid())
return QVariant();
int row = index.row();
int column = index.column();
if(row < 0 || row >= mods.size())
if (row < 0 || row >= mods.size())
return QVariant();
if(role != Qt::DisplayRole)
if (role != Qt::DisplayRole)
return QVariant();
switch(column)
switch (column)
{
case 0:
return mods[row].name();
case 1:
return mods[row].version();
case 2:
return mods[row].mcversion();
default:
return QVariant();
case 0:
return mods[row].name();
case 1:
return mods[row].version();
case 2:
return mods[row].mcversion();
default:
return QVariant();
}
}
QVariant ModList::headerData ( int section, Qt::Orientation orientation, int role ) const
QVariant ModList::headerData(int section, Qt::Orientation orientation, int role) const
{
if (role != Qt::DisplayRole || orientation != Qt::Horizontal)
return QVariant();
@ -370,10 +366,9 @@ QVariant ModList::headerData ( int section, Qt::Orientation orientation, int rol
}
}
Qt::ItemFlags ModList::flags ( const QModelIndex& index ) const
Qt::ItemFlags ModList::flags(const QModelIndex &index) const
{
Qt::ItemFlags defaultFlags = QAbstractListModel::flags ( index );
Qt::ItemFlags defaultFlags = QAbstractListModel::flags(index);
if (index.isValid())
return Qt::ItemIsDragEnabled | Qt::ItemIsDropEnabled | defaultFlags;
else
@ -400,36 +395,37 @@ Qt::DropActions ModList::supportedDragActions() const
return Qt::MoveAction;
}
QMimeData* ModList::mimeData ( const QModelIndexList& indexes ) const
QMimeData *ModList::mimeData(const QModelIndexList &indexes) const
{
QMimeData * data = new QMimeData();
if(indexes.size() == 0)
QMimeData *data = new QMimeData();
if (indexes.size() == 0)
return data;
auto idx = indexes[0];
int row = idx.row();
if(row <0 || row >= mods.size())
if (row < 0 || row >= mods.size())
return data;
QStringList params;
params << m_list_id << QString::number(row);
data->setText(params.join('|'));
return data;
}
bool ModList::dropMimeData ( const QMimeData* data, Qt::DropAction action, int row, int column, const QModelIndex& parent )
bool ModList::dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column,
const QModelIndex &parent)
{
if (action == Qt::IgnoreAction)
return true;
return true;
// check if the action is supported
if (!data || !(action & supportedDropActions()))
return false;
if(parent.isValid())
if (parent.isValid())
{
row = parent.row();
column = parent.column();
}
if (row > rowCount())
row = rowCount();
if (row == -1)
@ -437,41 +433,41 @@ bool ModList::dropMimeData ( const QMimeData* data, Qt::DropAction action, int r
if (column == -1)
column = 0;
QLOG_INFO() << "Drop row: " << row << " column: " << column;
// files dropped from outside?
if(data->hasUrls())
if (data->hasUrls())
{
bool was_watching = is_watching;
if(was_watching)
if (was_watching)
stopWatching();
auto urls = data->urls();
for(auto url: urls)
for (auto url : urls)
{
// only local files may be dropped...
if(!url.isLocalFile())
if (!url.isLocalFile())
continue;
QString filename = url.toLocalFile();
installMod(filename, row);
QLOG_INFO() << "installing: " << filename;
}
if(was_watching)
if (was_watching)
startWatching();
return true;
}
else if(data->hasText())
else if (data->hasText())
{
QString sourcestr = data->text();
auto list = sourcestr.split('|');
if(list.size() != 2)
if (list.size() != 2)
return false;
QString remoteId = list[0];
int remoteIndex = list[1].toInt();
QLOG_INFO() << "move: " << sourcestr;
// no moving of things between two lists
if(remoteId != m_list_id)
if (remoteId != m_list_id)
return false;
// no point moving to the same place...
if(row == remoteIndex)
if (row == remoteIndex)
return false;
// otherwise, move the mod :D
moveModTo(remoteIndex, row);
@ -479,4 +475,3 @@ bool ModList::dropMimeData ( const QMimeData* data, Qt::DropAction action, int r
}
return false;
}

6
logic/OneSixInstance.cpp
View File

@ -168,8 +168,7 @@ std::shared_ptr<ModList> OneSixInstance::loaderModList()
{
d->loader_mod_list.reset(new ModList(loaderModsDir()));
}
else
d->loader_mod_list->update();
d->loader_mod_list->update();
return d->loader_mod_list;
}
@ -180,8 +179,7 @@ std::shared_ptr<ModList> OneSixInstance::resourcePackList()
{
d->resource_pack_list.reset(new ModList(resourcePacksDir()));
}
else
d->resource_pack_list->update();
d->resource_pack_list->update();
return d->resource_pack_list;
}