Resolved merge conflicts #117
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 7 commits
July 9, 2021 18:00
+ merge conflicts resolved + the .NET version was changed to 4.6.1 + removed Log folder from .gitignore because there is code in that folder I did not look into cleaning anything else up. I think there are still some fragments from the earlier merge that should be cleaned up. This Commit is a working version for me. I did not observe any major bugs.
It always proposes to update when it starts and i don't know how to make it stop
* CurrentWallpaperHolder.cs seems to sometimes not contain the image information. Now it always returns the current information in Properties.Settings because I am not familiar enough with the code to fix it properly * WallpaperChanger.cs wouldn't always reset isRunning to 0 before a return * RWC.cs the history page will now be recreated whenever the wallpaper changes (this might cause the program to hang for a few seconds whenever it comes up) and some blacklist calls wouldn't change the wallpaper * RWC.resx just automatic changes i guess. no clue
- Old imgur links will work now - Requests will now contain an over18 cookie with the value 1 - If an exception occurs while checking a wallpaper, it will now be rejected
* some inconsistencies among the settings files resolved * added a TODO note to fix the auto updater
Starting without existing config files would cause a NullReferenceException because the Database tried to create a path to the database before the used Setting was initialized.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I did not look into cleaning anything else up. I think there are still some fragments from the earlier merge that should be cleaned up.
This Commit is a working version for me. I did not observe any major bugs.