Index: src/client/cl_research.c
===================================================================
--- src/client/cl_research.c    (Revision 7646)
+++ src/client/cl_research.c    (Arbeitskopie)
@@ -335,9 +335,9 @@
                tech = &gd.technologies[i];
                tech->statusResearchable = qfalse;
        }
-
+
        /* Update the "amount" and statusCollected values in the requirement-trees. */
-       RS_CheckAllCollected(); 
+       RS_CheckAllCollected();
 
        for (i = 0; i < gd.numTechnologies; i++) {      /* i = tech-index */
                tech = &gd.technologies[i];
@@ -2071,7 +2071,7 @@
  */
 void INV_EnableAutosell (technology_t *tech)
 {
-       int i, j;
+       int i = 0, j;
        technology_t *ammotech = NULL;
 
        /* If the tech leads to weapon or armour, find related item and enable autosell. */
@@ -2082,6 +2082,8 @@
                                break;
                        }
                }
+               if (i == csi.numODs)
+                       return;
        }
 
        /* If the weapon has ammo, enable autosell for proper ammo as well. */