[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/KDE/3.4/kdelibs/kdeprint
From:       Cristian Tibirna <tibirna () kde ! org>
Date:       2005-10-01 4:54:35
Message-ID: 1128142475.413041.4486.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 465877 by tibirna:

backport r464359 fix bug 97694


 M  +12 -6     kpqtpage.cpp  


--- branches/KDE/3.4/kdelibs/kdeprint/kpqtpage.cpp #465876:465877
@@ -270,15 +270,21 @@
 	ID = NUP_1;
 	if (opts["_kde-filters"].find("psnup") != -1)
 	{
-		ID = opts["_kde-psnup-nup"].toInt();
-		if (ID == 1 || ID == 2 || ID == 4)
-		{
-			if (ID == 4) ID = 3;
-			ID--;
+		if (opts.contains("_kde-psnup-nup")) {
+			ID = opts["_kde-psnup-nup"].toInt();
+			if (ID == 1 || ID == 2 || ID == 4)
+			{
+				if (ID == 4) ID = 3;
+				ID--;
+			}
+			else
+			{
+				ID = NUP_OTHER;
+			}
 		}
 		else
 		{
-			ID = NUP_OTHER;
+			ID = NUP_1;
 		}
 	}
 	m_nupbox->setButton(ID);
[prev in list] [next in list] [prev in thread] [next in thread]