X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fpoll.cpp;h=659e2385ff5c5c3dadf0ffea2bde277e1bdfb711;hb=53782f997e03e4f05b06624a47de29414696a5a8;hp=3b349b4b187f824ab2152cb3fa0d896cad0e59f1;hpb=c8a3f4ae89bc415bfbd877b3f4c3605ac3cf4010;p=libs%2Fcore.git

diff --git a/source/poll.cpp b/source/poll.cpp
index 3b349b4..659e238 100644
--- a/source/poll.cpp
+++ b/source/poll.cpp
@@ -100,8 +100,6 @@ void Poller::set_object(Base &obj, PollEvent ev)
 	if(ev)
 		obj.get_event_handle();
 
-	//cout<<"poller set_object "<<&obj<<' '<<ev<<'\n';
-
 	SlotMap::iterator i=objects.find(&obj);
 	if(i!=objects.end())
 	{
@@ -162,14 +160,11 @@ int Poller::do_poll(int timeout)
 
 	poll_result.clear();
 
-	if(pfd.empty())
-		throw InvalidState("Nothing to poll");
-
 #ifdef WIN32
 	if(timeout<0)
 		timeout=INFINITE;
 
-	DWORD ret=WaitForMultipleObjects(pfd.size(), reinterpret_cast<HANDLE *>(&pfd.front()), false, timeout);
+	DWORD ret=WaitForMultipleObjects(pfd.size(), &pfd.front().fd, false, timeout);
 	if(/*ret>=WAIT_OBJECT_0 &&*/ ret<WAIT_OBJECT_0+pfd.size())
 	{
 		SlotMap::iterator i=objects.begin();