TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-02 18:03:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix plugin for Safari 5 lameness

Browse Source
This commit is contained in:
David Rose 2011-08-25 07:35:30 +00:00
parent b2cc3f3490
commit 443fff604b
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
direct/src/plugin/p3dInstance.cxx
View File

@ -3864,6 +3864,7 @@ add_cocoa_modifier_flags(unsigned int &swb_flags, int modifiers) {
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
void P3DInstance:: void P3DInstance::
send_notify(const string &message) { send_notify(const string &message) {
nout << "send_notify(" << message << ")\n";
P3D_request *request = new P3D_request; P3D_request *request = new P3D_request;
request->_instance = NULL; request->_instance = NULL;
request->_request_type = P3D_RT_notify; request->_request_type = P3D_RT_notify;

6
direct/src/plugin_npapi/ppInstance.cxx
View File

@ -210,6 +210,12 @@ begin() {
set_failed(); set_failed();
return; return;
} }
#else
// While Safari 5 on Mac claims to provide this function, it doesn't
// appear to work. (!) So we pretend we never have it on Mac.
// Fortunately, this hack does us no harm because the _request_timer
// hack works fine on OSX.
has_plugin_thread_async_call = false;
#endif // __APPLE__ #endif // __APPLE__
string url = PANDA_PACKAGE_HOST_URL; string url = PANDA_PACKAGE_HOST_URL;