Index: mythgame/mythgame/gamehandler.cpp
===================================================================
--- mythgame/mythgame/gamehandler.cpp	(Revision 7093)
+++ mythgame/mythgame/gamehandler.cpp	(Arbeitskopie)
@@ -216,7 +216,7 @@
     QString queryvalues;
 
     QString lastrom = "";
-    QRegExp multiDiskRGXP = QRegExp( ".[0-4].*$", TRUE, FALSE );
+    QRegExp multiDiskRGXP = QRegExp( "[0-4]$", TRUE, FALSE );
     int diskcount = 0;
     QString firstname;
     QString basename;
@@ -280,10 +280,19 @@
 
                 if (handler->SpanDisks()) 
                 {
-                    if (RomName.contains(multiDiskRGXP))
                     {
-                        basename = GameName.left(GameName.findRev("."));
+                        basename = GameName.right(1);
+			
+			if (basename.contains(multiDiskRGXP))
+			    {
+			    basename = GameName.left(GameName.length() - 1);
 
+     			    if (basename.right(1) == ".")
+				basename = GameName.left(GameName.length() - 2);
+			    }
+			else
+			    basename = GameName;
+			
                         if (basename == lastrom)
                         {
                             displayrom = 0;
@@ -299,8 +308,7 @@
                             lastrom = basename;
                             diskcount = 1;
                         }
-                        GameName = GameName.left(GameName.findRev("."));
-                           
+                        GameName = basename;                       
                     }
                 }
 
@@ -481,7 +489,7 @@
                 {
                     if (romdata->DiskCount() > 1) 
                     {
-                        QString basename = romdata->Gamename().left(romdata->Gamename().findRev("."));
+                        QString basename = romdata->Gamename().left(romdata->Gamename().length() - 1);
                         QString extension = romdata->getExtension();
                         QString rom;
                         QString diskid[] = { "%d0", "%d1", "%d2", "%d3", "%d4", "%d5", "%d6" };
Index: mythgame/mythgame/gametree.cpp
===================================================================
--- mythgame/mythgame/gametree.cpp	(Revision 7093)
+++ mythgame/mythgame/gametree.cpp	(Arbeitskopie)
@@ -331,6 +331,7 @@
     info_popup->addLabel(QString("CRC : %1").arg(rom->CRC_VALUE()));
     info_popup->addLabel(QString("Path: %1").arg(rom->Rompath()));
     info_popup->addLabel(QString("Type: %1").arg(rom->GameType()));
+    info_popup->addLabel(QString("Diskcount: %1").arg(rom->DiskCount()));
     info_popup->addLabel(QString("Player(s): %1").arg(rom->AllSystems())); 
 
     OKButton = info_popup->addButton(QString("OK"), this,