Merge branch 'qbittorrent:master' into feat-seed-stats-on-add

Author: jabloink

src/app/localpeer.cpp

@@ -114,8 +114,11 @@ bool LocalPeer::isClient()
 
         if (const std::optional<LockInfo> lockInfo = getLockInfo())
         {
-            if (lockInfo->hostid == QSysInfo::machineUniqueId())
+            if ((lockInfo->hostid == QSysInfo::machineUniqueId())
+                    && (lockInfo->hostname == QSysInfo::machineHostName()))
+            {
                 return true;
+            }
 
             if (!m_lockFile.removeStaleLockFile() || !m_lockFile.tryLock())
                 return true;

src/gui/log/loglistview.cpp

@@ -140,7 +140,7 @@ LogListView::LogListView(QWidget *parent)
     setSelectionMode(QAbstractItemView::ExtendedSelection);
     setItemDelegate(new LogItemDelegate(this));
 
-#ifdef Q_OS_MAC
+#ifdef Q_OS_MACOS
     setAttribute(Qt::WA_MacShowFocusRect, false);
 #endif
 }

src/gui/optionsdialog.cpp

@@ -442,7 +442,7 @@ void OptionsDialog::loadBehaviorTabOptions()
     m_ui->assocPanel->hide();
 #endif
 
-#ifdef Q_OS_MAC
+#ifdef Q_OS_MACOS
     m_ui->defaultProgramPanel->hide();
 #endif
 

src/webui/api/torrentscontroller.cpp

@@ -1148,6 +1148,7 @@ void TorrentsController::addAction()
     const double ratioLimit = parseDouble(params()[u"ratioLimit"_s]).value_or(BitTorrent::DEFAULT_RATIO_LIMIT);
     const int seedingTimeLimit = parseInt(params()[u"seedingTimeLimit"_s]).value_or(BitTorrent::DEFAULT_SEEDING_TIME_LIMIT);
     const int inactiveSeedingTimeLimit = parseInt(params()[u"inactiveSeedingTimeLimit"_s]).value_or(BitTorrent::DEFAULT_SEEDING_TIME_LIMIT);
+    const BitTorrent::ShareLimitsMode shareLimitsMode = Utils::String::toEnum(params()[u"shareLimitsMode"_s], BitTorrent::ShareLimitsMode::Default);
     const BitTorrent::ShareLimitAction shareLimitAction = Utils::String::toEnum(params()[u"shareLimitAction"_s], BitTorrent::ShareLimitAction::Default);
     const std::optional<bool> autoTMM = parseBool(params()[u"autoTMM"_s]);
 
@@ -1217,6 +1218,7 @@ void TorrentsController::addAction()
             .ratioLimit = ratioLimit,
             .seedingTimeLimit = seedingTimeLimit,
             .inactiveSeedingTimeLimit = inactiveSeedingTimeLimit,
+            .mode = shareLimitsMode,
             .action = shareLimitAction
         },
         .sslParameters =