Gurkengewuerz/ImgScroll
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into hotfix-updater

Browse Source 
Conflicts:
	pom.xml
	src/main/java/com/rarchives/ripme/ui/UpdateUtils.java
This commit is contained in:
4pr0n 2014-04-08 23:35:39 -07:00
commit 66671ff552
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/rarchives/ripme/ui/ClipboardUtils.java
View File

@ -45,7 +45,7 @@ public class ClipboardUtils {
} }
class AutoripThread extends Thread { class AutoripThread extends Thread {
public volatile boolean isRunning = false; protected volatile boolean isRunning = false;
Set<String> rippedURLs = new HashSet<String>(); Set<String> rippedURLs = new HashSet<String>();
public void run() { public void run() {

1
src/main/java/com/rarchives/ripme/ui/MainWindow.java
View File

@ -162,7 +162,6 @@ public class MainWindow implements Runnable, RipStatusHandler {
Utils.setConfigBoolean("auto.update", configAutoupdateCheckbox.isSelected()); Utils.setConfigBoolean("auto.update", configAutoupdateCheckbox.isSelected());
saveHistory(); saveHistory();
Utils.saveConfig(); Utils.saveConfig();
ClipboardUtils.setClipboardAutoRip(false);
} }
private void status(String text) { private void status(String text) {