Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 4 additions & 15 deletions src/dlls.manifest.debug.qt6
Original file line number Diff line number Diff line change
Expand Up @@ -4,39 +4,28 @@
<file name="7z.dll" />
<file name="archive.dll" />
<file name="d3dcompiler_47.dll" />
<file name="dxcompiler.dll" />
<file name="dxil.dll" />
<file name="libbsarch.dll" />
<file name="libcrypto-3-x64.dll" />
<file name="libEGL.dll" />
<file name="libGLESV2.dll" />
<file name="liblz4.dll" />
<file name="libssl-3-x64.dll" />
<file name="opengl32sw.dll" />
<file name="Qt6Concurrentd.dll" />
<file name="Qt6Cored.dll" />
<file name="Qt6Core5Compatd.dll" />
<file name="Qt6Guid.dll" />
<file name="Qt6Networkd.dll" />
<file name="Qt6OpenGLd.dll" />
<file name="Qt6OpenGLWidgetsd.dll" />
<file name="Qt6Positioningd.dll" />
<file name="Qt6PrintSupportd.dll" />
<file name="Qt6Qmld.dll" />
<file name="Qt6QmlLocalStoraged.dll" />
<file name="Qt6QmlMetad.dll" />
<file name="Qt6QmlModelsd.dll" />
<file name="Qt6QmlWorkerScriptd.dll" />
<file name="Qt6QmlXmlListModeld.dll" />
<file name="Qt6Quickd.dll" />
<file name="Qt6QuickControls2d.dll" />
<file name="Qt6QuickControls2Impld.dll" />
<file name="Qt6QuickDialogs2d.dll" />
<file name="Qt6QuickDialogs2QuickImpld.dll" />
<file name="Qt6QuickDialogs2Utilsd.dll" />
<file name="Qt6QuickLayoutsd.dll" />
<file name="Qt6QuickParticlesd.dll" />
<file name="Qt6QuickShapesd.dll" />
<file name="Qt6QuickTemplates2d.dll" />
<file name="Qt6QuickWidgetsd.dll" />
<file name="Qt6Sqld.dll" />
<file name="Qt6SerialPortd.dll" />
<file name="Qt6Svgd.dll" />
<file name="Qt6WebChanneld.dll" />
<file name="Qt6WebEngineCored.dll" />
Expand Down
19 changes: 4 additions & 15 deletions src/dlls.manifest.qt6
Original file line number Diff line number Diff line change
Expand Up @@ -4,39 +4,28 @@
<file name="7z.dll" />
<file name="archive.dll" />
<file name="d3dcompiler_47.dll" />
<file name="dxcompiler.dll" />
<file name="dxil.dll" />
<file name="libbsarch.dll" />
<file name="libcrypto-3-x64.dll" />
<file name="libEGL.dll" />
<file name="libGLESV2.dll" />
<file name="liblz4.dll" />
<file name="libssl-3-x64.dll" />
<file name="opengl32sw.dll" />
<file name="Qt6Concurrent.dll" />
<file name="Qt6Core.dll" />
<file name="Qt6Core5Compat.dll" />
<file name="Qt6Gui.dll" />
<file name="Qt6Network.dll" />
<file name="Qt6OpenGL.dll" />
<file name="Qt6OpenGLWidgets.dll" />
<file name="Qt6Positioning.dll" />
<file name="Qt6PrintSupport.dll" />
<file name="Qt6Qml.dll" />
<file name="Qt6QmlLocalStorage.dll" />
<file name="Qt6QmlMeta.dll" />
<file name="Qt6QmlModels.dll" />
<file name="Qt6QmlWorkerScript.dll" />
<file name="Qt6QmlXmlListModel.dll" />
<file name="Qt6Quick.dll" />
<file name="Qt6QuickControls2.dll" />
<file name="Qt6QuickControls2Impl.dll" />
<file name="Qt6QuickDialogs2.dll" />
<file name="Qt6QuickDialogs2QuickImpl.dll" />
<file name="Qt6QuickDialogs2Utils.dll" />
<file name="Qt6QuickLayouts.dll" />
<file name="Qt6QuickParticles.dll" />
<file name="Qt6QuickShapes.dll" />
<file name="Qt6QuickTemplates2.dll" />
<file name="Qt6QuickWidgets.dll" />
<file name="Qt6Sql.dll" />
<file name="Qt6SerialPort.dll" />
<file name="Qt6Svg.dll" />
<file name="Qt6WebChannel.dll" />
<file name="Qt6WebEngineCore.dll" />
Expand Down
3 changes: 3 additions & 0 deletions src/downloadmanager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -332,6 +332,7 @@ void DownloadManager::refreshList()
TimeThis tt("DownloadManager::refreshList()");

try {
emit aboutToUpdate();
// avoid triggering other refreshes
ScopedDisableDirWatcher scopedDirWatcher(this);

Expand Down Expand Up @@ -2225,10 +2226,12 @@ void DownloadManager::downloadFinished(int index)
"There may be an issue with the Nexus servers."));
emit update(-1);
} else if (info->isPausedState() || info->m_State == STATE_PAUSING) {
emit aboutToUpdate();
info->m_Output.close();
createMetaFile(info);
emit update(index);
} else {
emit aboutToUpdate();
QString url = info->m_Urls[info->m_CurrentUrl];
if (info->m_FileInfo->userData.contains("downloadMap")) {
foreach (const QVariant& server,
Expand Down
3 changes: 3 additions & 0 deletions src/modinfodialogesps.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ class ESPListModel : public QAbstractItemModel
public:
void clear()
{
beginResetModel();
m_esps.clear();
endResetModel();
}
Expand Down Expand Up @@ -161,6 +162,8 @@ class ESPListModel : public QAbstractItemModel

void finished()
{
beginResetModel();

std::sort(m_esps.begin(), m_esps.end(), [](const auto& a, const auto& b) {
return (naturalCompare(a.filename(), b.filename()) < 0);
});
Expand Down
3 changes: 3 additions & 0 deletions src/modinfodialogtextfiles.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ class FileListModel : public QAbstractItemModel
public:
void clear()
{
beginResetModel();
m_files.clear();
endResetModel();
}
Expand Down Expand Up @@ -58,6 +59,8 @@ class FileListModel : public QAbstractItemModel

void finished()
{
beginResetModel();

std::sort(m_files.begin(), m_files.end(), [](const auto& a, const auto& b) {
return (naturalCompare(a.text, b.text) < 0);
});
Expand Down
6 changes: 4 additions & 2 deletions src/modlistview.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1078,7 +1078,8 @@ void ModListView::setOverwriteMarkers(const QModelIndexList& indexes)
}
}
dataChanged(model()->index(0, 0),
model()->index(model()->rowCount(), model()->columnCount()));
model()->index(model()->rowCount() ? model()->rowCount() - 1 : 0,
model()->columnCount() ? model()->columnCount() - 1 : 0));
verticalScrollBar()->repaint();
}

Expand Down Expand Up @@ -1117,7 +1118,8 @@ void ModListView::setHighlightedMods(const std::set<QString>& modNames)
}
}
dataChanged(model()->index(0, 0),
model()->index(model()->rowCount(), model()->columnCount()));
model()->index(model()->rowCount() ? model()->rowCount() - 1 : 0,
model()->columnCount() ? model()->columnCount() - 1 : 0));
verticalScrollBar()->repaint();
}

Expand Down
Loading