diff -r 38fb6f7eacd5 -r bf64cebf4673 camerauis/cameraapp/generic/inc/CamAppUi.h
--- a/camerauis/cameraapp/generic/inc/CamAppUi.h	Tue Apr 27 16:19:06 2010 +0300
+++ b/camerauis/cameraapp/generic/inc/CamAppUi.h	Tue May 11 15:56:11 2010 +0300
@@ -86,6 +86,7 @@
                   public MCamFileCheckObserver,
                   public MCamCameraObserver
                   ,public MCamAddToAlbumObserver
+                  ,public MAknServerAppExitObserver
   {
   // =======================================================
   // Data Types
@@ -1430,6 +1431,18 @@
         void CheckAlbumIdOperationCompleteL(
                 TBool aAlbumExists, const TDesC& aAlbumTitle );
 
+    public: // MAknServerAppExitObserver
+        /**
+        * Handle the exit of a connected server app.
+        * This implementation provides Series 60 default behavior
+        * for handling of the EAknCmdExit exit code. Derived classes
+        * should base-call this implementation if they override this
+        * function.
+        * @param aReason The reason that the server application exited.
+        * This will either be an error code, or the command id that caused
+        * the server app to exit.
+        */
+        virtual void HandleServerAppExit(TInt aReason);
 
     private:
 
@@ -1829,6 +1842,8 @@
         TBool iMemoryAvailableForCapturing;
 
         CCamStartupLogoController* iStartupLogoController;
+
+        TBool iVideoClipPlayInProgress;
         };
 
 // ===========================================================================