Fix loading of last used settings in Import CSV dialog

MKleusberg · MKleusberg · commit cec6b825611a · 2019-05-07T23:16:09.000+02:00
Fix the loading of the last used import settings in the Import CSV
dialog when the "Other" option has been used in one of the dropdown
boxes.
diff --git a/src/ImportCsvDialog.cpp b/src/ImportCsvDialog.cpp
@@ -710,7 +710,7 @@ void ImportCsvDialog::setQuoteChar(const QChar& c)
     int index = combo->findText(c);
     if(index == -1)
     {
-        combo->setCurrentIndex(combo->count());
+        combo->setCurrentIndex(combo->count() - 1);
         ui->editCustomQuote->setText(c);
     }
     else
@@ -738,7 +738,7 @@ void ImportCsvDialog::setSeparatorChar(const QChar& c)
     int index = combo->findText(sText);
     if(index == -1)
     {
-        combo->setCurrentIndex(combo->count());
+        combo->setCurrentIndex(combo->count() - 1);
         ui->editCustomSeparator->setText(c);
     }
     else
@@ -762,7 +762,7 @@ void ImportCsvDialog::setEncoding(const QString& sEnc)
     int index = combo->findText(sEnc);
     if(index == -1)
     {
-        combo->setCurrentIndex(combo->count());
+        combo->setCurrentIndex(combo->count() - 1);
         ui->editCustomEncoding->setText(sEnc);
     }
     else

Original file line number	Diff line number	Diff line change
`@@ -710,7 +710,7 @@ void ImportCsvDialog::setQuoteChar(const QChar& c)`
`710`	`710`	`int index = combo->findText(c);`
`711`	`711`	`if(index == -1)`
`712`	`712`	`{`
`713`		`- combo->setCurrentIndex(combo->count());`
	`713`	`+ combo->setCurrentIndex(combo->count() - 1);`
`714`	`714`	`ui->editCustomQuote->setText(c);`
`715`	`715`	`}`
`716`	`716`	`else`
`@@ -738,7 +738,7 @@ void ImportCsvDialog::setSeparatorChar(const QChar& c)`
`738`	`738`	`int index = combo->findText(sText);`
`739`	`739`	`if(index == -1)`
`740`	`740`	`{`
`741`		`- combo->setCurrentIndex(combo->count());`
	`741`	`+ combo->setCurrentIndex(combo->count() - 1);`
`742`	`742`	`ui->editCustomSeparator->setText(c);`
`743`	`743`	`}`
`744`	`744`	`else`
`@@ -762,7 +762,7 @@ void ImportCsvDialog::setEncoding(const QString& sEnc)`
`762`	`762`	`int index = combo->findText(sEnc);`
`763`	`763`	`if(index == -1)`
`764`	`764`	`{`
`765`		`- combo->setCurrentIndex(combo->count());`
	`765`	`+ combo->setCurrentIndex(combo->count() - 1);`
`766`	`766`	`ui->editCustomEncoding->setText(sEnc);`
`767`	`767`	`}`
`768`	`768`	`else`