diff options
| author | PacketVideo CM <engbuild@pv.com> | 2010-06-23 14:06:52 -0700 |
|---|---|---|
| committer | PacketVideo CM <engbuild@pv.com> | 2010-06-23 14:31:04 -0700 |
| commit | 2230762b384e5facb00d8e1887ef1ddcf0e9eb08 (patch) | |
| tree | b667b23726569f3a45f967382d658b6d8aae54e8 | |
| parent | d4da20221cd8d3b0b67ef626a4443e99b00b1c8e (diff) | |
| download | opencore-2230762b384e5facb00d8e1887ef1ddcf0e9eb08.tar.gz | |
RIO-8874: Fixed bug in player engine error-handling code.
Change-Id: Iae38faeeaeabb7e1a17bf925b67bb4a27f689d74
| -rw-r--r-- | engines/2way/src/pv_2way_sdkinfo.h | 2 | ||||
| -rw-r--r-- | engines/author/src/pv_author_sdkinfo.h | 2 | ||||
| -rw-r--r-- | engines/player/src/pv_player_engine.cpp | 10 | ||||
| -rw-r--r-- | engines/player/src/pv_player_sdkinfo.h | 2 |
4 files changed, 11 insertions, 5 deletions
diff --git a/engines/2way/src/pv_2way_sdkinfo.h b/engines/2way/src/pv_2way_sdkinfo.h index f278f7f03..b8c4dd62c 100644 --- a/engines/2way/src/pv_2way_sdkinfo.h +++ b/engines/2way/src/pv_2way_sdkinfo.h @@ -21,7 +21,7 @@ // This header file is automatically generated at build-time // *** OFFICIAL RELEASE INFO -- Will not auto update -#define PV2WAY_ENGINE_SDKINFO_LABEL "1503703" +#define PV2WAY_ENGINE_SDKINFO_LABEL "1504894" #define PV2WAY_ENGINE_SDKINFO_DATE 0x20100618 #endif //PV_2WAY_SDKINFO_H_INCLUDED diff --git a/engines/author/src/pv_author_sdkinfo.h b/engines/author/src/pv_author_sdkinfo.h index cd80edb48..5ecbb4ae8 100644 --- a/engines/author/src/pv_author_sdkinfo.h +++ b/engines/author/src/pv_author_sdkinfo.h @@ -21,7 +21,7 @@ // This header file is automatically generated at build-time // *** OFFICIAL RELEASE INFO -- Will not auto update -#define PVAUTHOR_ENGINE_SDKINFO_LABEL "1503703" +#define PVAUTHOR_ENGINE_SDKINFO_LABEL "1504894" #define PVAUTHOR_ENGINE_SDKINFO_DATE 0x20100618 #endif //PV_AUTHOR_SDKINFO_H_INCLUDED diff --git a/engines/player/src/pv_player_engine.cpp b/engines/player/src/pv_player_engine.cpp index 33e13f7cf..c9fbcad5d 100644 --- a/engines/player/src/pv_player_engine.cpp +++ b/engines/player/src/pv_player_engine.cpp @@ -3584,6 +3584,14 @@ void PVPlayerEngine::EngineCommandCompleted(PVCommandId aId, OsclAny* aContext, PVLOGGER_LOGMSG(PVLOGMSG_INST_HLDBG, iLogger, PVLOGMSG_ERR, (0, "PVPlayerEngine::EngineCommandCompleted() iCmdStatusObserver is NULL")); } + // Destroy error handling related extended error message if present. This needs to be + // destroyed before data source is removed. + if (iCommandCompleteErrMsgInErrorHandling) + { + iCommandCompleteErrMsgInErrorHandling->removeRef(); + iCommandCompleteErrMsgInErrorHandling = NULL; + } + if (iRemoveDataSource) { if (iDataSource) @@ -16176,8 +16184,6 @@ PVMFStatus PVPlayerEngine::DoErrorHandling() iCurrentCmd[0].GetContext(), iCommandCompleteStatusInErrorHandling, OSCL_STATIC_CAST(PVInterface*, iCommandCompleteErrMsgInErrorHandling)); - iCommandCompleteErrMsgInErrorHandling->removeRef(); - iCommandCompleteErrMsgInErrorHandling = NULL; } else { diff --git a/engines/player/src/pv_player_sdkinfo.h b/engines/player/src/pv_player_sdkinfo.h index 0f9b60dd4..bae522cb2 100644 --- a/engines/player/src/pv_player_sdkinfo.h +++ b/engines/player/src/pv_player_sdkinfo.h @@ -21,7 +21,7 @@ // This header file is automatically generated at build-time // *** OFFICIAL RELEASE INFO -- Will not auto update -#define PVPLAYER_ENGINE_SDKINFO_LABEL "1503703" +#define PVPLAYER_ENGINE_SDKINFO_LABEL "1504894" #define PVPLAYER_ENGINE_SDKINFO_DATE 0x20100618 #endif //PV_PLAYER_SDKINFO_H_INCLUDED |