[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-1969-g6296876

[Bastiaan Jacques]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".

The branch, master has been updated
       via  629687688c98fdb5ac001e4d24c37ccbc3863225 (commit)
      from  d2ebf63b161eea504695f734f042bcee7b949f82 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=629687688c98fdb5ac001e4d24c37ccbc3863225


commit 629687688c98fdb5ac001e4d24c37ccbc3863225
Author: Bastiaan Jacques <address@hidden>
Date:   Fri May 2 23:36:03 2014 +0200

    Restore timeout to two seconds.

diff --git a/plugin/npapi/pluginScriptObject.cpp 
b/plugin/npapi/pluginScriptObject.cpp
index 22033bd..538427e 100644
--- a/plugin/npapi/pluginScriptObject.cpp
+++ b/plugin/npapi/pluginScriptObject.cpp
@@ -703,7 +703,7 @@ GnashPluginScriptObject::readPlayer(int fd)
     pfds[0].fd = fd;
     pfds[0].events = POLLIN;
 
-    int rv = poll(pfds, 1 /* arraySize */, 1000 /* ms */);
+    int rv = poll(pfds, 1 /* arraySize */, 2000 /* ms */);
 
     // No data yet
     if (rv <= 0) {

-----------------------------------------------------------------------

Summary of changes:
 plugin/npapi/pluginScriptObject.cpp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Gnash