2 files changed, 32 insertions, 20 deletions
diff --git a/lib/web/webprofile.cpp b/lib/web/webprofile.cpp
index b40a98c..67671a0 100644
--- a/lib/web/webprofile.cpp
+++ b/lib/web/webprofile.cpp
@@ -14,23 +14,33 @@
 
 WebProfile *WebProfile::profile = nullptr;
 
-void loadProfile(WebProfile *profile, const QHash<QString, QString> &defaults, const QString &path)
+WebProfile* loadProfile(const QString &name, const QHash<QString, QString> &defaults, const QString &path)
 {
-    Q_CHECK_PTR(profile);
-
-    profile->setSearch(defaults.value("profile.search"));
-    profile->setHomepage(QUrl::fromUserInput(defaults.value("profile.homepage")));
-    profile->setNewtab(QUrl::fromUserInput(defaults.value("profile.newtab")));
-
-    // return if there is no config file
-    if(!QFileInfo::exists(path))
-        return;
-
+    WebProfile *profile = nullptr;
 #ifdef QT_DEBUG
-    qDebug("+ Reading config for profile '%s': %s", qUtf8Printable(profile->name()), qUtf8Printable(path));
+    qDebug("+ Reading config for profile '%s': %s", qUtf8Printable(name), qUtf8Printable(path));
 #endif
     QSettings config(path, QSettings::IniFormat);
 
+    if(name.isEmpty()) {
+        // a default otr profile
+        profile = new WebProfile(QObject::tr("Off-the-record"), nullptr);
+
+    } else if(config.value("otr").toBool()) {
+        // a named otr profile
+        profile = new WebProfile(config.value("name", name).toString(), nullptr);
+
+    } else {
+        // a named profile
+        profile = new WebProfile(name, config.value("name", name).toString(), nullptr);
+    }
+
+    Q_CHECK_PTR(profile);
+
+    profile->setSearch(config.value("search", defaults.value("profile.search")).toString());
+    profile->setHomepage(config.value("homepage", defaults.value("profile.homepage")).toUrl());
+    profile->setNewtab(config.value("newtab", defaults.value("profile.newtab")).toUrl());
+
     config.beginGroup("properties");
     {
         const auto keys = config.childKeys();
@@ -56,20 +66,22 @@ void loadProfile(WebProfile *profile, const QHash<QString, QString> &defaults, c
         }
     }
     config.endGroup();
+
+    return profile;
 }
 
-WebProfile::WebProfile(QObject *parent)
+WebProfile::WebProfile(const QString &name, QObject *parent)
     : QWebEngineProfile(parent)
 {
-    m_name = tr("Off-the-record");
+    m_name = name;
 
 #ifdef QT_DEBUG
-    qDebug("Creating off-the-record profile");
+    qDebug("Creating otr profile %s", qUtf8Printable(m_name));
 #endif
 }
 
-WebProfile::WebProfile(const QString &name, QObject *parent)
-    : QWebEngineProfile(name, parent)
+WebProfile::WebProfile(const QString &storageName, const QString &name, QObject *parent)
+    : QWebEngineProfile(storageName, parent)
 {
     m_name = name;
 
diff --git a/lib/web/webprofile.h b/lib/web/webprofile.h
index 31c5b44..a421359 100644
--- a/lib/web/webprofile.h
+++ b/lib/web/webprofile.h
@@ -34,9 +34,9 @@ class WebProfile : public QWebEngineProfile
 
 public:
     // off-the-record constructor
-    explicit WebProfile(QObject *parent = nullptr);
-    // default constructor
     explicit WebProfile(const QString &name, QObject *parent = nullptr);
+    // default constructor
+    explicit WebProfile(const QString &storageName, const QString &name, QObject *parent = nullptr);
 
     ~WebProfile() = default;
 
@@ -108,7 +108,7 @@ private:
     QUrl m_newtab = QUrl("about:blank");
 };
 
-void loadProfile(WebProfile *profile, const QHash<QString, QString> &defaults, const QString &path);
+WebProfile* loadProfile(const QString &name, const QHash<QString, QString> &defaults, const QString &path = QString());
 //WebProfile *saveProfile(WebProfile *profile, const QString &path);
 
 #endif // SMOLBOTE_WEBENGINEPROFILE_H