Compare commits

..
4 Commits
Author SHA1 Message Date
LePresidente 35e0bc2285 Disable BSA Conflict Checking.
Version Bump to 2.1.0.1 (Once off using the 4th point do to change being so minor) Next version will be 2.1.1
2017-12-26 11:53:29 +02:00
LePresidente 2ea23c4129 Disable the bsa tab for release
Version bump to 2.1.0
Updated about window
2017-12-25 07:04:55 +02:00
Brian Munro 100f57dea1 Merge pull request #161 from erasmux/deactivate_bug_fix
Fix rare crash when deactiving mods
2017-12-24 17:37:54 +02:00
Eran Mizrahi 708928e643 Fix rare crash when deactiving mods 2017-12-24 17:24:46 +02:00
5 changed files with 53 additions and 10 deletions
+43 -2
View File
@@ -154,8 +154,44 @@
<string>Thanks</string>
</attribute>
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
<item>
<widget class="QGroupBox" name="groupBox">
<property name="title">
<string>Current Maintainers</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_6">
<item>
<widget class="QListWidget" name="listWidget_2">
<property name="selectionMode">
<enum>QAbstractItemView::NoSelection</enum>
</property>
<item>
<property name="text">
<string notr="true">LePresidente</string>
</property>
</item>
<item>
<property name="text">
<string notr="true">Silarn</string>
</property>
</item>
<item>
<property name="text">
<string notr="true">erasmux</string>
</property>
</item>
<item>
<property name="text">
<string notr="true">Diana</string>
</property>
</item>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="groupBox_2">
<property name="title">
<string>Translators</string>
</property>
@@ -237,7 +273,7 @@
</widget>
</item>
<item>
<widget class="QGroupBox" name="groupBox_2">
<widget class="QGroupBox" name="groupBox_3">
<property name="title">
<string>Other Supporter</string>
</property>
@@ -247,6 +283,11 @@
<property name="selectionMode">
<enum>QAbstractItemView::NoSelection</enum>
</property>
<item>
<property name="text">
<string notr="true">Al12 (Discord) </string>
</property>
</item>
<item>
<property name="text">
<string notr="true">blacksol</string>
+2 -2
View File
@@ -88,8 +88,8 @@ void DirectoryRefresher::addModBSAToStructure(DirectoryEntry *directoryStructure
QFileInfo fileInfo(archive);
if (m_EnabledArchives.find(fileInfo.fileName()) != m_EnabledArchives.end()) {
try {
directoryStructure->addFromBSA(ToWString(modName), directoryW,
ToWString(QDir::toNativeSeparators(fileInfo.absoluteFilePath())), priority);
//directoryStructure->addFromBSA(ToWString(modName), directoryW,
// ToWString(QDir::toNativeSeparators(fileInfo.absoluteFilePath())), priority);
} catch (const std::exception &e) {
throw MyException(tr("failed to parse bsa %1: %2").arg(archive, e.what()));
}
+3 -1
View File
@@ -906,11 +906,13 @@ p, li { white-space: pre-wrap; }
<attribute name="title">
<string>Archives</string>
</attribute>
<property name="visible">
<bool>true</bool>
</property>
<layout class="QVBoxLayout" name="verticalLayout_9">
<property name="leftMargin">
<number>6</number>
</property>
<property name="topMargin">
<number>6</number>
</property>
+3 -3
View File
@@ -213,9 +213,9 @@ void FilesOrigin::setName(const std::wstring &name)
std::vector<FileEntry::Ptr> FilesOrigin::getFiles() const
{
std::vector<FileEntry::Ptr> result;
for (FileEntry::Index fileIdx : m_Files) {
result.push_back(m_FileRegister.lock()->getFile(fileIdx));
}
for (FileEntry::Index fileIdx : m_Files)
if (FileEntry::Ptr p = m_FileRegister.lock()->getFile(fileIdx))
result.push_back(p);
return result;
}
+2 -2
View File
@@ -1,7 +1,7 @@
#include "Winver.h"
#define VER_FILEVERSION 2,1,0
#define VER_FILEVERSION_STR "2.1.0beta\0"
#define VER_FILEVERSION 2,1,0,1
#define VER_FILEVERSION_STR "2.1.0.1\0"
VS_VERSION_INFO VERSIONINFO
FILEVERSION VER_FILEVERSION