Author: jkupec Date: Thu Mar 13 13:26:00 2008 New Revision: 9114 URL: http://svn.opensuse.org/viewcvs/zypp?rev=9114&view=rev Log: - check the devindex returned from the callback Modified: trunk/libzypp/zypp/MediaSetAccess.cc Modified: trunk/libzypp/zypp/MediaSetAccess.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/MediaSetAccess.cc?rev=9114&r1=9113&r2=9114&view=diff ============================================================================== --- trunk/libzypp/zypp/MediaSetAccess.cc (original) +++ trunk/libzypp/zypp/MediaSetAccess.cc Thu Mar 13 13:26:00 2008 @@ -177,7 +177,8 @@ DBG << "Eject: try to release" << endl; media_mgr.releaseAll(); // eject - media_mgr.release (media, devices.empty() ? "" : devices[devindex]); + media_mgr.release (media, + devindex < devices.size() ? devices[devindex] : ""); } else if ( user == media::MediaChangeReport::RETRY || user == media::MediaChangeReport::CHANGE_URL ) @@ -300,7 +301,8 @@ DBG << "Eject: try to release" << endl; media_mgr.releaseAll(); // eject - media_mgr.release (media, devices.empty() ? "" : devices[devindex]); + media_mgr.release (media, + devindex < devices.size() ? devices[devindex] : ""); } else if ( user == media::MediaChangeReport::RETRY || user == media::MediaChangeReport::CHANGE_URL ) @@ -433,7 +435,8 @@ DBG << "Eject: try to release" << endl; media_mgr.releaseAll(); // eject - media_mgr.release(_media, devices.empty() ? "" : devices[devindex]); + media_mgr.release (_media, + devindex < devices.size() ? devices[devindex] : ""); } else if (user == media::MediaChangeReport::RETRY || user == media::MediaChangeReport::CHANGE_URL) -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org