mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-26 23:28:14 +03:00
Code Issues Projects Releases Packages Wiki Activity

SetupPage: Fix crash caused by uninitialized Account object.

Browse source 
Since the webdav path is read from account now, it needs to be
initialized first thing.
This commit is contained in:
Klaas Freitag 2015-09-10 16:03:22 +02:00
parent cf7726353a
commit 9eec45f9c4
1 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/gui/wizard/owncloudsetuppage.cpp
View file

@ -45,6 +45,7 @@ OwncloudSetupPage::OwncloudSetupPage(QWidget *parent)
_progressIndi(new QProgressIndicator (this))
{
_ui.setupUi(this);
_ocWizard = qobject_cast<OwncloudWizard *>(parent);
Theme *theme = Theme::instance();
setTitle(WizardCommon::titleTemplate().arg(tr("Connect to %1").arg(theme->appNameGUI())));
@ -66,7 +67,6 @@ OwncloudSetupPage::OwncloudSetupPage(QWidget *parent)
connect(_ui.leUrl, SIGNAL(editingFinished()), SLOT(slotUrlEditFinished()));
addCertDial = new AddCertificateDialog(this);
_ocWizard = qobject_cast<OwncloudWizard *>(parent);
connect(_ocWizard,SIGNAL(needCertificate()),this,SLOT(slotAskSSLClientCertificate()));
}
@ -106,14 +106,16 @@ void OwncloudSetupPage::slotUrlChanged(const QString& url)
if (url.endsWith("index.php")) {
newUrl.chop(9);
}
QString webDavPath = _ocWizard->account()->davPath();
if (url.endsWith(webDavPath)) {
newUrl.chop( webDavPath.length() );
}
if( webDavPath.endsWith(QLatin1Char('/')) ) {
webDavPath.chop(1); // cut off the slash
if( url.endsWith(webDavPath)) {
newUrl.chop(webDavPath.length());
if( _ocWizard && _ocWizard->account() ) {
QString webDavPath = _ocWizard->account()->davPath();
if (url.endsWith(webDavPath)) {
newUrl.chop( webDavPath.length() );
}
if( webDavPath.endsWith(QLatin1Char('/')) ) {
webDavPath.chop(1); // cut off the slash
if( url.endsWith(webDavPath)) {
newUrl.chop(webDavPath.length());
}
}
}
if (newUrl != url) {