[Supertuxkart-commit] SF.net SVN: supertuxkart:[9697] main/trunk/src/addons

[<hik...@us...>]

Revision: 9697
          http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=9697&view=rev
Author:   hikerstk
Date:     2011-09-01 01:58:27 +0000 (Thu, 01 Sep 2011)
Log Message:
-----------
Fixed bugs in request sorting (HC_QUIT request with highest
priority did not get sorted to be the next request to be
executed).

Modified Paths:
--------------
    main/trunk/src/addons/network_http.cpp
    main/trunk/src/addons/request.hpp

Modified: main/trunk/src/addons/network_http.cpp
===================================================================
--- main/trunk/src/addons/network_http.cpp	2011-09-01 01:10:43 UTC (rev 9696)
+++ main/trunk/src/addons/network_http.cpp	2011-09-01 01:58:27 UTC (rev 9697)
@@ -586,7 +586,7 @@
     {
         m_all_requests.getData().push_back(request);
         unsigned int i=m_all_requests.getData().size()-1;
-        while(i>0 && *(m_all_requests.getData()[i])<*request)
+        while(i>0 && *(m_all_requests.getData()[i-1])<*request)
         {
                 m_all_requests.getData()[i] = m_all_requests.getData()[i-1];
                 i--;

Modified: main/trunk/src/addons/request.hpp
===================================================================
--- main/trunk/src/addons/request.hpp	2011-09-01 01:10:43 UTC (rev 9696)
+++ main/trunk/src/addons/request.hpp	2011-09-01 01:58:27 UTC (rev 9697)
@@ -93,7 +93,7 @@
     void setProgress(float f) { m_progress.setAtomic(f); }
     // --------------------------------------------------------------------
     /** Used in sorting requests by priority. */
-    bool operator<(const Request &r) { return r.m_priority < m_priority;}
+    bool operator<(const Request &r) { return m_priority < r.m_priority;}
     // --------------------------------------------------------------------
     /** Signals that this request should be cancelled. */
     void cancel() { m_cancel = true; }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.