[Player-cvs] app/gtk mainapp.cpp,1.141.2.44,1.141.2.45
dyek at helixcommunity.org dyek at helixcommunity.orgUpdate of /cvsroot/player/app/gtk
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv7819
Modified Files:
Tag: hxclient_3_1_0_atlas
mainapp.cpp
Log Message:
Merge from 347Atlas.
Removed hxclient_player ref_count warning.
Since the hxclient_player->ref_count check has been moved to hxwindow_unrealize() and that is too early for the check, and after that, we have no more reference to perform ref_count check in hxwindow_destroy(), I simply removed the check.
Files Modified:
player/app/gtk/mainapp.cpp
Refer to the following URL for more information:
http://lists.helixcommunity.org/pipermail/player-dev/2009-March/004195.html
Index: mainapp.cpp
===================================================================
RCS file: /cvsroot/player/app/gtk/mainapp.cpp,v
retrieving revision 1.141.2.44
retrieving revision 1.141.2.45
diff -u -d -r1.141.2.44 -r1.141.2.45
--- mainapp.cpp 10 Mar 2009 20:45:40 -0000 1.141.2.44
+++ mainapp.cpp 11 Mar 2009 01:32:20 -0000 1.141.2.45
@@ -5976,10 +5976,6 @@
// This results in hx_player_dispose() and hx_player_finalize() call.
g_object_unref(hxclient_player);
- if (hxclient_player->ref_count != 0)
- {
- g_warning("HXPlayer object not destructed when HXMainWindow is destroyed!\n");
- }
window->hxclient_player = NULL;
}