Fixed crash when opening about dialog
ClosedPublic

Authored by bruceoutdoors on Sep 15 2016, 12:47 AM.

Details

Reviewers
woltherav
rempt
Summary

a extra line at the end of credits.txt caused the crash (could be just in Windows). This patch is a half measure though; perhaps it would be better to code it such that it avoids empty spaces at the end?

Diff Detail

Repository
R37 Krita
Lint
Lint Skipped
Unit
Unit Tests Skipped
bruceoutdoors retitled this revision from to Fixed crash when opening about dialog.
bruceoutdoors updated this object.
bruceoutdoors edited the test plan for this revision. (Show Details)
bruceoutdoors added reviewers: woltherav, rempt.
bruceoutdoors set the repository for this revision to R37 Krita.
bruceoutdoors added a project: Krita.
rempt edited edge metadata.Sep 15 2016, 7:32 AM

That assert doesn't fire for me, but I guess that this diff would be a better solution:

diff --git a/libs/ui/dialogs/kis_about_application.cpp b/libs/ui/dialogs/kis_about_application.cpp
index be63486..d36d440 100644

  • a/libs/ui/dialogs/kis_about_application.cpp

+++ b/libs/ui/dialogs/kis_about_application.cpp
@@ -108,10 +108,9 @@ KisAboutApplication::KisAboutApplication(QWidget *parent)

Q_ASSERT(fileCredits.exists());
fileCredits.open(QIODevice::ReadOnly);
  • Q_FOREACH (const QByteArray &credit, fileCredits.readAll().split('\n')) {
  • if (!credit.isEmpty()) {

+ Q_FOREACH (const QByteArray &credit, QString::fromUtf8(fileCredits.readAll()).split('\n', QString::SkipEmptyParts)) {
+ if (credit.contains(":")) {

QList<QByteArray> creditSplit = credit.split(':');
  • Q_ASSERT(creditSplit.size() == 2); credits.append(QString::fromUtf8(creditSplit.at(0))); credits.append(" (<i>" + QString::fromUtf8(creditSplit.at(1)) + "</i>)"); credits.append(", ");

lines 1-17/17 (END)

The diff didn't render nicely in the comments, but I can see what you change in the commit log. That would be a much better solution. (y)

rempt accepted this revision.Sep 15 2016, 1:31 PM
rempt edited edge metadata.
This revision is now accepted and ready to land.Sep 15 2016, 1:31 PM
aacid closed this revision.Feb 26 2017, 11:28 PM
aacid added a subscriber: aacid.

I guess this can be closed since 69498052017786c80af686ce44a0f9621155209e was commited