Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change stop tracker timeout settings placement #11848

Merged
merged 1 commit into from Jan 11, 2020
Merged

Change stop tracker timeout settings placement #11848

merged 1 commit into from Jan 11, 2020

Conversation

ghost
Copy link

@ghost ghost commented Jan 9, 2020

New placement is below ANNOUNCE_IP.

@ghost
Copy link
Author

ghost commented Jan 9, 2020

@Chocobo1 please check.

@Chocobo1
Copy link
Member

Chocobo1 commented Jan 9, 2020

You should move the related code to the correct relative position in advancedsettings.cpp & advancedsettings.h and also in preferences.html.

Since you're already moving code around and if you have time please also move the related parts in appcontroller.cpp, session.cpp and session.h.

@Chocobo1 Chocobo1 added this to the 4.2.2 milestone Jan 9, 2020
@Chocobo1 Chocobo1 added the Hotfix Fix some bug(s) introduced by recently merged commit(s) label Jan 9, 2020
@ghost
Copy link
Author

ghost commented Jan 9, 2020

You should move the related code to the correct relative position in advancedsettings.cpp & advancedsettings.h and also in preferences.html.

Since you're already moving code around and if you have time please also move the related parts in appcontroller.cpp, session.cpp and session.h.

QSpinBox codes are already out of order in advancedsettings.h except first few...anyways I'll try to fix those.

@Chocobo1
Copy link
Member

Chocobo1 commented Jan 9, 2020

QSpinBox codes are already out of order in advancedsettings.h except first few...anyways I'll try to fix those.

I meant you can just fix the option added in #11834 and ignore the others.

@ghost
Copy link
Author

ghost commented Jan 9, 2020

QSpinBox codes are already out of order in advancedsettings.h except first few...anyways I'll try to fix those.

I meant you can just fix the option added in #11834 and ignore the others.

Done.

src/base/bittorrent/session.cpp Outdated Show resolved Hide resolved
src/base/bittorrent/session.cpp Outdated Show resolved Hide resolved
@ghost ghost requested a review from Chocobo1 January 9, 2020 19:11
@Chocobo1 Chocobo1 merged commit a124dec into qbittorrent:master Jan 11, 2020
@Chocobo1
Copy link
Member

Chocobo1 commented Jan 11, 2020

@An0n666
Thank you!

@ghost ghost deleted the stop_tracker_timeout_placement branch January 11, 2020 02:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Hotfix Fix some bug(s) introduced by recently merged commit(s)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants