Merge pull request #2 from qbittorrent/master

Up-to-date commit

src/properties/peerlistwidget.cpp

@@ -316,8 +316,10 @@ void PeerListWidget::loadPeers(const QTorrentHandle &h, bool force_hostname_reso
   std::vector<peer_info>::const_iterator itrend = peers.end();
   for ( ; itr != itrend; ++itr) {
     peer_info peer = *itr;
-    QString peer_ip = misc::toQString(peer.ip.address().to_string(ec));
-    if (ec) continue;
+    std::string ip_str = peer.ip.address().to_string(ec);
+    if (ec || ip_str.empty())
+      continue;
+    QString peer_ip = misc::toQString(ip_str);
     if (m_peerItems.contains(peer_ip)) {
       // Update existing peer
       updatePeer(peer_ip, peer);

src/properties/trackerlist.cpp

@@ -354,8 +354,6 @@ void TrackerList::showTrackerListMenu(QPoint) {
   if (!getSelectedTrackerItems().isEmpty()) {
     delAct = menu.addAction(IconProvider::instance()->getIcon("list-remove"), tr("Remove tracker"));
   }
-  menu.addSeparator();
-  QAction *reannounceAct = menu.addAction(IconProvider::instance()->getIcon("view-refresh"), tr("Force reannounce"));
   QAction *act = menu.exec(QCursor::pos());
   if (act == 0) return;
   if (act == addAct) {
@@ -370,10 +368,6 @@ void TrackerList::showTrackerListMenu(QPoint) {
     deleteSelectedTrackers();
     return;
   }
-  if (act == reannounceAct) {
-    properties->getCurrentTorrent().force_reannounce();
-    return;
-  }
 }
 
 void TrackerList::loadSettings() {

src/properties/trackersadditiondlg.h

@@ -53,9 +53,6 @@ public:
     setupUi(this);
     // Icons
     uTorrentListButton->setIcon(IconProvider::instance()->getIcon("download"));
-    // As a default, use torrentz.com link
-    list_url->setText("http://www.torrentz.com/announce_"+h.hash());
-    list_url->setCursorPosition(0);
   }
 
   ~TrackersAdditionDlg() {}