Revert "added error message if settings initalizion failed"
This reverts commit 2b9b96abb5.
This commit is contained in:
@@ -8,7 +8,6 @@
|
|||||||
#include <csignal>
|
#include <csignal>
|
||||||
|
|
||||||
#include "Application.hpp"
|
#include "Application.hpp"
|
||||||
#include "common/Modes.hpp"
|
|
||||||
#include "common/NetworkManager.hpp"
|
#include "common/NetworkManager.hpp"
|
||||||
#include "singletons/Paths.hpp"
|
#include "singletons/Paths.hpp"
|
||||||
#include "singletons/Resources.hpp"
|
#include "singletons/Resources.hpp"
|
||||||
|
|||||||
+3
-30
@@ -5,7 +5,6 @@
|
|||||||
#include "BrowserExtension.hpp"
|
#include "BrowserExtension.hpp"
|
||||||
#include "RunGui.hpp"
|
#include "RunGui.hpp"
|
||||||
#include "common/Args.hpp"
|
#include "common/Args.hpp"
|
||||||
#include "common/Modes.hpp"
|
|
||||||
#include "singletons/Paths.hpp"
|
#include "singletons/Paths.hpp"
|
||||||
#include "singletons/Settings.hpp"
|
#include "singletons/Settings.hpp"
|
||||||
#include "util/IncognitoBrowser.hpp"
|
#include "util/IncognitoBrowser.hpp"
|
||||||
@@ -29,35 +28,9 @@ int main(int argc, char **argv)
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
initArgs(args);
|
initArgs(args);
|
||||||
Paths *paths{};
|
Paths paths;
|
||||||
|
Settings settings(paths.settingsDirectory);
|
||||||
|
|
||||||
try
|
runGui(a, paths, settings);
|
||||||
{
|
|
||||||
paths = new Paths;
|
|
||||||
}
|
|
||||||
catch (std::runtime_error &error)
|
|
||||||
{
|
|
||||||
QMessageBox box;
|
|
||||||
if (Modes::getInstance().isPortable)
|
|
||||||
{
|
|
||||||
box.setText(
|
|
||||||
error.what() +
|
|
||||||
QStringLiteral(
|
|
||||||
"\n\nInfo: Portable mode requires the application to "
|
|
||||||
"be in a writeable location. If you don't want "
|
|
||||||
"portable mode reinstall the application. "
|
|
||||||
"https://chatterino.com."));
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
box.setText(error.what());
|
|
||||||
}
|
|
||||||
box.exec();
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
Settings settings(paths->settingsDirectory);
|
|
||||||
|
|
||||||
runGui(a, *paths, settings);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -11,8 +11,6 @@
|
|||||||
#include "common/Modes.hpp"
|
#include "common/Modes.hpp"
|
||||||
#include "util/CombinePath.hpp"
|
#include "util/CombinePath.hpp"
|
||||||
|
|
||||||
using namespace std::literals;
|
|
||||||
|
|
||||||
namespace chatterino {
|
namespace chatterino {
|
||||||
|
|
||||||
Paths *Paths::instance = nullptr;
|
Paths *Paths::instance = nullptr;
|
||||||
@@ -24,7 +22,7 @@ Paths::Paths()
|
|||||||
this->initAppFilePathHash();
|
this->initAppFilePathHash();
|
||||||
|
|
||||||
this->initCheckPortable();
|
this->initCheckPortable();
|
||||||
this->initRootDirectory();
|
this->initAppDataDirectory();
|
||||||
this->initSubDirectories();
|
this->initSubDirectories();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -78,7 +76,7 @@ void Paths::initCheckPortable()
|
|||||||
combinePath(QCoreApplication::applicationDirPath(), "portable"));
|
combinePath(QCoreApplication::applicationDirPath(), "portable"));
|
||||||
}
|
}
|
||||||
|
|
||||||
void Paths::initRootDirectory()
|
void Paths::initAppDataDirectory()
|
||||||
{
|
{
|
||||||
assert(this->portable_.is_initialized());
|
assert(this->portable_.is_initialized());
|
||||||
|
|
||||||
@@ -97,8 +95,8 @@ void Paths::initRootDirectory()
|
|||||||
QStandardPaths::writableLocation(QStandardPaths::AppDataLocation);
|
QStandardPaths::writableLocation(QStandardPaths::AppDataLocation);
|
||||||
if (path.isEmpty())
|
if (path.isEmpty())
|
||||||
{
|
{
|
||||||
throw std::runtime_error("Could not create directory \""s +
|
throw std::runtime_error(
|
||||||
path.toStdString() + "\"");
|
"Error finding writable location for settings");
|
||||||
}
|
}
|
||||||
|
|
||||||
// create directory Chatterino2 instead of chatterino on windows because the
|
// create directory Chatterino2 instead of chatterino on windows because the
|
||||||
@@ -125,8 +123,8 @@ void Paths::initSubDirectories()
|
|||||||
|
|
||||||
if (!QDir().mkpath(path))
|
if (!QDir().mkpath(path))
|
||||||
{
|
{
|
||||||
throw std::runtime_error("Could not create directory \""s +
|
throw std::runtime_error(
|
||||||
path.toStdString() + "\"");
|
"Error creating appdata path %appdata%/chatterino/" + name);
|
||||||
}
|
}
|
||||||
|
|
||||||
return path;
|
return path;
|
||||||
|
|||||||
@@ -39,7 +39,7 @@ public:
|
|||||||
private:
|
private:
|
||||||
void initAppFilePathHash();
|
void initAppFilePathHash();
|
||||||
void initCheckPortable();
|
void initCheckPortable();
|
||||||
void initRootDirectory();
|
void initAppDataDirectory();
|
||||||
void initSubDirectories();
|
void initSubDirectories();
|
||||||
|
|
||||||
boost::optional<bool> portable_;
|
boost::optional<bool> portable_;
|
||||||
|
|||||||
Reference in New Issue
Block a user