diff options
| -rw-r--r-- | src/gui/newwizard/pages/accountconfiguredwizardpage.cpp | 7 | ||||
| -rw-r--r-- | src/gui/newwizard/states/accountconfiguredsetupwizardstate.cpp | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/src/gui/newwizard/pages/accountconfiguredwizardpage.cpp b/src/gui/newwizard/pages/accountconfiguredwizardpage.cpp index b0248ed46..e734052fc 100644 --- a/src/gui/newwizard/pages/accountconfiguredwizardpage.cpp +++ b/src/gui/newwizard/pages/accountconfiguredwizardpage.cpp @@ -87,7 +87,12 @@ AccountConfiguredWizardPage::AccountConfiguredWizardPage(const QString &defaultS }); // this should be handled on application startup, too - Q_ASSERT(!Theme::instance()->forceVirtualFilesOption() || vfsIsAvailable); + if (Theme::instance()->forceVirtualFilesOption()) { + if (!vfsModeIsExperimental) { + // note: this might fail when the VFS plugins have not been built (yet) as well + Q_ASSERT(vfsIsAvailable); + } + } if (Theme::instance()->forceVirtualFilesOption()) { // this has no visual effect, but is needed for syncMode() diff --git a/src/gui/newwizard/states/accountconfiguredsetupwizardstate.cpp b/src/gui/newwizard/states/accountconfiguredsetupwizardstate.cpp index 3ee3a8e97..50bd97592 100644 --- a/src/gui/newwizard/states/accountconfiguredsetupwizardstate.cpp +++ b/src/gui/newwizard/states/accountconfiguredsetupwizardstate.cpp @@ -17,6 +17,7 @@ #include "accountconfiguredsetupwizardstate.h" #include "gui/folderman.h" #include "pages/accountconfiguredwizardpage.h" +#include "theme.h" namespace OCC::Wizard { @@ -35,7 +36,8 @@ AccountConfiguredSetupWizardState::AccountConfiguredSetupWizardState(SetupWizard vfsModeIsExperimental = false; break; case Vfs::WithSuffix: - vfsIsAvailable = true; + // we ignore forceVirtualFilesOption if experimental features are disabled + vfsIsAvailable = Theme::instance()->enableExperimentalFeatures(); enableVfsByDefault = false; vfsModeIsExperimental = true; break; |