Revert "added error message if settings initalizion failed"

This reverts commit 2b9b96abb5.
This commit is contained in:
fourtf 2019-10-03 22:12:22 +02:00
parent 5aff7b0b40
commit f3ff40385d
4 changed files with 10 additions and 40 deletions

View file

@ -8,7 +8,6 @@
#include <csignal>
#include "Application.hpp"
#include "common/Modes.hpp"
#include "common/NetworkManager.hpp"
#include "singletons/Paths.hpp"
#include "singletons/Resources.hpp"

View file

@ -5,7 +5,6 @@
#include "BrowserExtension.hpp"
#include "RunGui.hpp"
#include "common/Args.hpp"
#include "common/Modes.hpp"
#include "singletons/Paths.hpp"
#include "singletons/Settings.hpp"
#include "util/IncognitoBrowser.hpp"
@ -29,35 +28,9 @@ int main(int argc, char **argv)
else
{
initArgs(args);
Paths *paths{};
Paths paths;
Settings settings(paths.settingsDirectory);
try
{
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);
runGui(a, paths, settings);
}
}

View file

@ -11,8 +11,6 @@
#include "common/Modes.hpp"
#include "util/CombinePath.hpp"
using namespace std::literals;
namespace chatterino {
Paths *Paths::instance = nullptr;
@ -24,7 +22,7 @@ Paths::Paths()
this->initAppFilePathHash();
this->initCheckPortable();
this->initRootDirectory();
this->initAppDataDirectory();
this->initSubDirectories();
}
@ -78,7 +76,7 @@ void Paths::initCheckPortable()
combinePath(QCoreApplication::applicationDirPath(), "portable"));
}
void Paths::initRootDirectory()
void Paths::initAppDataDirectory()
{
assert(this->portable_.is_initialized());
@ -97,8 +95,8 @@ void Paths::initRootDirectory()
QStandardPaths::writableLocation(QStandardPaths::AppDataLocation);
if (path.isEmpty())
{
throw std::runtime_error("Could not create directory \""s +
path.toStdString() + "\"");
throw std::runtime_error(
"Error finding writable location for settings");
}
// create directory Chatterino2 instead of chatterino on windows because the
@ -125,8 +123,8 @@ void Paths::initSubDirectories()
if (!QDir().mkpath(path))
{
throw std::runtime_error("Could not create directory \""s +
path.toStdString() + "\"");
throw std::runtime_error(
"Error creating appdata path %appdata%/chatterino/" + name);
}
return path;

View file

@ -39,7 +39,7 @@ public:
private:
void initAppFilePathHash();
void initCheckPortable();
void initRootDirectory();
void initAppDataDirectory();
void initSubDirectories();
boost::optional<bool> portable_;