--- a/photosgallery/controllers/imageviewer/src/glximageviewermanager.cpp	Thu Dec 17 08:45:44 2009 +0200
+++ b/photosgallery/controllers/imageviewer/src/glximageviewermanager.cpp	Thu Jan 07 12:46:23 2010 +0200
@@ -63,10 +63,6 @@
     TRACER("CGlxImageViewerManager::~CGlxImageViewerManager()");
     delete iImageUri;
 
-    if( iFile )
-        {
-        iFile->Close();
-        }
     }
 
 CGlxImageViewerManager* CGlxImageViewerManager::NewLC()
@@ -82,7 +78,7 @@
     {
     TRACER("CGlxImageViewerManager::NewLC()");
     CGlxImageViewerManager* self = CGlxImageViewerManager::NewLC();
-    CleanupStack::Pop(); // self;
+    CleanupStack::Pop(self);
     return self;
     }
 
@@ -104,7 +100,14 @@
         delete iImageUri;
         iImageUri = NULL;
         }
-    iImageUri = aFileName.AllocL();    
+    if (aFileName.Length() == 0)
+        {
+        User::Leave(KErrNotSupported);    
+        }
+    else
+        {
+    	iImageUri = aFileName.AllocL();    
+		}
     }
 
 // ---------------------------------------------------------------------------